Migrate some more layouts to data driven (#19889)

6 files changed, 399 insertions, 511 deletions

diff --git a/keyboards/mt/ncr80/hotswap/hotswap.c b/keyboards/mt/ncr80/hotswap/hotswap.c
deleted file mode 100644
index 93a9b53c12..0000000000
--- a/keyboards/mt/ncr80/hotswap/hotswap.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 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/>.
-*/
-
-#include "hotswap.h"
diff --git a/keyboards/mt/ncr80/hotswap/hotswap.h b/keyboards/mt/ncr80/hotswap/hotswap.h
deleted file mode 100644
index 586ce4622f..0000000000
--- a/keyboards/mt/ncr80/hotswap/hotswap.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2022 Jordan Duabe
- * Copyright 2022 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/>.
- */
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-
-#define LAYOUT( \
-    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,            K76, K72, K71, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,           K86, K82, K81, \
-      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
-    K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                           K92, \
-    K50,      K52,            K56,                          K57,      K53,          KA6, KA2, KA1  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, XXX, K52, K53, XXX, XXX, K56, K57, XXX }, \
-    { XXX, XXX, XXX, K63, K64, K65, XXX, K67, K68 }, \
-    { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
-    { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { XXX, XXX, K92, K93, XXX, K95, XXX, K97, K98 }, \
-    { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
-}
-
-
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
index 89f38c9588..ed288b9e8d 100644
--- a/keyboards/mt/ncr80/hotswap/info.json
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -19,87 +19,99 @@
     "layouts": {
           "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.5 },
-                { "label": "!", "x": 1, "y": 1.5 },
-                { "label": "@", "x": 2, "y": 1.5 },
-                { "label": "#", "x": 3, "y": 1.5 },
-                { "label": "$", "x": 4, "y": 1.5 },
-                { "label": "%", "x": 5, "y": 1.5 },
-                { "label": "^", "x": 6, "y": 1.5 },
-                { "label": "&", "x": 7, "y": 1.5 },
-                { "label": "*", "x": 8, "y": 1.5 },
-                { "label": "(", "x": 9, "y": 1.5 },
-                { "label": ")", "x": 10, "y": 1.5 },
-                { "label": "_", "x": 11, "y": 1.5 },
-                { "label": "+", "x": 12, "y": 1.5 },
-                { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
-                { "label": "Insert", "x": 15.25, "y": 1.5 },
-                { "label": "Home", "x": 16.25, "y": 1.5 },
-                { "label": "PgUp", "x": 17.25, "y": 1.5 },
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
-                { "label": "Up", "x": 16.25, "y": 4.5 },
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "Space", "x": 4, "y": 5.5, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
-                { "label": "Left", "x": 15.25, "y": 5.5 },
-                { "label": "Down", "x": 16.25, "y": 5.5 },
-                { "label": "Right", "x": 17.25, "y": 5.5 }
+                { "x": 0, "y": 0, "matrix": [0, 0] },
+
+                { "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": [6, 8] },
+
+                { "x": 11, "y": 0, "matrix": [6, 7] },
+                { "x": 12, "y": 0, "matrix": [6, 5] },
+                { "x": 13, "y": 0, "matrix": [6, 4] },
+                { "x": 14, "y": 0, "matrix": [6, 3] },
+
+                { "x": 0, "y": 1.5, "matrix": [1, 0] },
+                { "x": 1, "y": 1.5, "matrix": [1, 1] },
+                { "x": 2, "y": 1.5, "matrix": [1, 2] },
+                { "x": 3, "y": 1.5, "matrix": [1, 3] },
+                { "x": 4, "y": 1.5, "matrix": [1, 4] },
+                { "x": 5, "y": 1.5, "matrix": [1, 5] },
+                { "x": 6, "y": 1.5, "matrix": [1, 6] },
+                { "x": 7, "y": 1.5, "matrix": [1, 7] },
+                { "x": 8, "y": 1.5, "matrix": [1, 8] },
+                { "x": 9, "y": 1.5, "matrix": [7, 8] },
+                { "x": 10, "y": 1.5, "matrix": [7, 0] },
+                { "x": 11, "y": 1.5, "matrix": [7, 7] },
+                { "x": 12, "y": 1.5, "matrix": [7, 5] },
+                { "x": 13, "y": 1.5, "w": 2, "matrix": [7, 3] },
+
+                { "x": 15.25, "y": 1.5, "matrix": [7, 6] },
+                { "x": 16.25, "y": 1.5, "matrix": [7, 2] },
+                { "x": 17.25, "y": 1.5, "matrix": [7, 1] },
+
+                { "x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0] },
+                { "x": 1.5, "y": 2.5, "matrix": [2, 1] },
+                { "x": 2.5, "y": 2.5, "matrix": [2, 2] },
+                { "x": 3.5, "y": 2.5, "matrix": [2, 3] },
+                { "x": 4.5, "y": 2.5, "matrix": [2, 4] },
+                { "x": 5.5, "y": 2.5, "matrix": [2, 5] },
+                { "x": 6.5, "y": 2.5, "matrix": [2, 6] },
+                { "x": 7.5, "y": 2.5, "matrix": [2, 7] },
+                { "x": 8.5, "y": 2.5, "matrix": [2, 8] },
+                { "x": 9.5, "y": 2.5, "matrix": [8, 8] },
+                { "x": 10.5, "y": 2.5, "matrix": [8, 7] },
+                { "x": 11.5, "y": 2.5, "matrix": [8, 5] },
+                { "x": 12.5, "y": 2.5, "matrix": [8, 4] },
+                { "x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3] },
+
+                { "x": 15.25, "y": 2.5, "matrix": [8, 6] },
+                { "x": 16.25, "y": 2.5, "matrix": [8, 2] },
+                { "x": 17.25, "y": 2.5, "matrix": [8, 1] },
+
+                { "x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0] },
+                { "x": 1.75, "y": 3.5, "matrix": [3, 1] },
+                { "x": 2.75, "y": 3.5, "matrix": [3, 2] },
+                { "x": 3.75, "y": 3.5, "matrix": [3, 3] },
+                { "x": 4.75, "y": 3.5, "matrix": [3, 4] },
+                { "x": 5.75, "y": 3.5, "matrix": [3, 5] },
+                { "x": 6.75, "y": 3.5, "matrix": [3, 6] },
+                { "x": 7.75, "y": 3.5, "matrix": [3, 7] },
+                { "x": 8.75, "y": 3.5, "matrix": [3, 8] },
+                { "x": 9.75, "y": 3.5, "matrix": [9, 8] },
+                { "x": 10.75, "y": 3.5, "matrix": [9, 7] },
+                { "x": 11.75, "y": 3.5, "matrix": [9, 5] },
+                { "x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3] },
+
+                { "x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0] },
+                { "x": 2.25, "y": 4.5, "matrix": [4, 2] },
+                { "x": 3.25, "y": 4.5, "matrix": [4, 3] },
+                { "x": 4.25, "y": 4.5, "matrix": [4, 4] },
+                { "x": 5.25, "y": 4.5, "matrix": [4, 5] },
+                { "x": 6.25, "y": 4.5, "matrix": [4, 6] },
+                { "x": 7.25, "y": 4.5, "matrix": [4, 7] },
+                { "x": 8.25, "y": 4.5, "matrix": [4, 8] },
+                { "x": 9.25, "y": 4.5, "matrix": [10, 8] },
+                { "x": 10.25, "y": 4.5, "matrix": [10, 7] },
+                { "x": 11.25, "y": 4.5, "matrix": [10, 5] },
+                { "x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4] },
+
+                { "x": 16.25, "y": 4.5, "matrix": [9, 2] },
+
+                { "x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0] },
+                { "x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2] },
+                { "x": 4, "y": 5.5, "w": 7, "matrix": [5, 6] },
+                { "x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7] },
+                { "x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3] },
+
+                { "x": 15.25, "y": 5.5, "matrix": [10, 6] },
+                { "x": 16.25, "y": 5.5, "matrix": [10, 2] },
+                { "x": 17.25, "y": 5.5, "matrix": [10, 1] }
             ]
         }
     }
diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json
index a01b13dd3b..1718eae5fd 100644
--- a/keyboards/mt/ncr80/solder/info.json
+++ b/keyboards/mt/ncr80/solder/info.json
@@ -19,280 +19,318 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (E6,D0)", "x": 0, "y": 0 },
-                { "label": "K02 (E6,D2)", "x": 2, "y": 0 },
-                { "label": "K03 (E6,D3)", "x": 3, "y": 0 },
-                { "label": "K04 (E6,D5)", "x": 4, "y": 0 },
-                { "label": "K05 (E6,D4)", "x": 5, "y": 0 },
-                { "label": "K06 (E6,D6)", "x": 6.5, "y": 0 },
-                { "label": "K07 (E6,D7)", "x": 7.5, "y": 0 },
-                { "label": "K08 (E6,B4)", "x": 8.5, "y": 0 },
-                { "label": "K68 (F7,B4)", "x": 9.5, "y": 0 },
-                { "label": "K67 (F7,D7)", "x": 11, "y": 0 },
-                { "label": "K65 (F7,D4)", "x": 12, "y": 0 },
-                { "label": "K64 (F7,D5)", "x": 13, "y": 0 },
-                { "label": "K63 (F7,D3)", "x": 14, "y": 0 },
-                { "label": "K66 (F7,D6)", "x": 15.25, "y": 0 },
-                { "label": "K62 (F7,D2)", "x": 16.25, "y": 0 },
-                { "label": "K61 (F7,D1)", "x": 17.25, "y": 0 },
-                { "label": "K10 (B0,D0)", "x": 0, "y": 1.5 },
-                { "label": "K11 (B0,D1)", "x": 1, "y": 1.5 },
-                { "label": "K12 (B0,D2)", "x": 2, "y": 1.5 },
-                { "label": "K13 (B0,D3)", "x": 3, "y": 1.5 },
-                { "label": "K14 (B0,D5)", "x": 4, "y": 1.5 },
-                { "label": "K15 (B0,D4)", "x": 5, "y": 1.5 },
-                { "label": "K16 (B0,D6)", "x": 6, "y": 1.5 },
-                { "label": "K17 (B0,D7)", "x": 7, "y": 1.5 },
-                { "label": "K18 (B0,B4)", "x": 8, "y": 1.5 },
-                { "label": "K78 (F6,B4)", "x": 9, "y": 1.5 },
-                { "label": "K70 (F6,D0)", "x": 10, "y": 1.5 },
-                { "label": "K77 (F6,D7)", "x": 11, "y": 1.5 },
-                { "label": "K75 (F6,D4)", "x": 12, "y": 1.5 },
-                { "label": "K74 (F6,D5)", "x": 13, "y": 1.5 },
-                { "label": "K73 (F6,D3)", "x": 14, "y": 1.5 },
-                { "label": "K76 (F6,D6)", "x": 15.25, "y": 1.5 },
-                { "label": "K72 (F6,D2)", "x": 16.25, "y": 1.5 },
-                { "label": "K71 (F6,D1)", "x": 17.25, "y": 1.5 },
-                { "label": "K20 (B1,D0)", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "K21 (B1,D1)", "x": 1.5, "y": 2.5 },
-                { "label": "K22 (B1,D2)", "x": 2.5, "y": 2.5 },
-                { "label": "K23 (B1,D3)", "x": 3.5, "y": 2.5 },
-                { "label": "K24 (B1,D5)", "x": 4.5, "y": 2.5 },
-                { "label": "K25 (B1,D4)", "x": 5.5, "y": 2.5 },
-                { "label": "K26 (B1,D6)", "x": 6.5, "y": 2.5 },
-                { "label": "K27 (B1,D7)", "x": 7.5, "y": 2.5 },
-                { "label": "K28 (B1,B4)", "x": 8.5, "y": 2.5 },
-                { "label": "K88 (F5,B4)", "x": 9.5, "y": 2.5 },
-                { "label": "K87 (F5,D7)", "x": 10.5, "y": 2.5 },
-                { "label": "K85 (F5,D4)", "x": 11.5, "y": 2.5 },
-                { "label": "K84 (F5,D5)", "x": 12.5, "y": 2.5 },
-                { "label": "K83 (F5,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "K86 (F5,D6)", "x": 15.25, "y": 2.5 },
-                { "label": "K82 (F5,D2)", "x": 16.25, "y": 2.5 },
-                { "label": "K81 (F5,D1)", "x": 17.25, "y": 2.5 },
-                { "label": "K30 (B2,D0)", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "K31 (B2,D1)", "x": 1.75, "y": 3.5 },
-                { "label": "K32 (B2,D2)", "x": 2.75, "y": 3.5 },
-                { "label": "K33 (B2,D3)", "x": 3.75, "y": 3.5 },
-                { "label": "K34 (B2,D5)", "x": 4.75, "y": 3.5 },
-                { "label": "K35 (B2,D4)", "x": 5.75, "y": 3.5 },
-                { "label": "K36 (B2,D6)", "x": 6.75, "y": 3.5 },
-                { "label": "K37 (B2,D7)", "x": 7.75, "y": 3.5 },
-                { "label": "K38 (B2,B4)", "x": 8.75, "y": 3.5 },
-                { "label": "K98 (F4,B4)", "x": 9.75, "y": 3.5 },
-                { "label": "K97 (F4,D7)", "x": 10.75, "y": 3.5 },
-                { "label": "K95 (F4,D4)", "x": 11.75, "y": 3.5 },
-                { "label": "K93 (F4,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
-                { "label": "K40 (B3,D0)", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "K41 (B3,D1)", "x": 1.25, "y": 4.5 },
-                { "label": "K42 (B3,D2)", "x": 2.25, "y": 4.5 },
-                { "label": "K43 (B3,D3)", "x": 3.25, "y": 4.5 },
-                { "label": "K44 (B3,D5)", "x": 4.25, "y": 4.5 },
-                { "label": "K45 (B3,D4)", "x": 5.25, "y": 4.5 },
-                { "label": "K46 (B3,D6)", "x": 6.25, "y": 4.5 },
-                { "label": "K47 (B3,D7)", "x": 7.25, "y": 4.5 },
-                { "label": "K48 (B3,B4)", "x": 8.25, "y": 4.5 },
-                { "label": "KA8 (F1,B4)", "x": 9.25, "y": 4.5 },
-                { "label": "KA7 (F1,D7)", "x": 10.25, "y": 4.5 },
-                { "label": "KA5 (F1,D4)", "x": 11.25, "y": 4.5 },
-                { "label": "KA4 (F1,D5)", "x": 12.25, "y": 4.5, "w": 1.75 },
-                { "label": "KA3 (F1,D3)", "x": 14, "y": 4.5 },
-                { "label": "K92 (F4,D2)", "x": 16.25, "y": 4.5 },
-                { "label": "K50 (B7,D0)", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "K51 (B7,D1)", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "K52 (B7,D2)", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "label": "K56 (B7,D6)", "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "K58 (B7,B4)", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "K57 (B7,D7)", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "K54 (B7,D5)", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "K53 (B7,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "KA6 (F1,D6)", "x": 15.25, "y": 5.5 },
-                { "label": "KA2 (F1,D2)", "x": 16.25, "y": 5.5 },
-                { "label": "KA1 (F1,D1)", "x": 17.25, "y": 5.5 }
+                { "x": 0, "y": 0, "matrix": [0, 0] },
+
+                { "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": [6, 8] },
+
+                { "x": 11, "y": 0, "matrix": [6, 7] },
+                { "x": 12, "y": 0, "matrix": [6, 5] },
+                { "x": 13, "y": 0, "matrix": [6, 4] },
+                { "x": 14, "y": 0, "matrix": [6, 3] },
+
+                { "x": 15.25, "y": 0, "matrix": [6, 6] },
+                { "x": 16.25, "y": 0, "matrix": [6, 2] },
+                { "x": 17.25, "y": 0, "matrix": [6, 1] },
+
+                { "x": 0, "y": 1.5, "matrix": [1, 0] },
+                { "x": 1, "y": 1.5, "matrix": [1, 1] },
+                { "x": 2, "y": 1.5, "matrix": [1, 2] },
+                { "x": 3, "y": 1.5, "matrix": [1, 3] },
+                { "x": 4, "y": 1.5, "matrix": [1, 4] },
+                { "x": 5, "y": 1.5, "matrix": [1, 5] },
+                { "x": 6, "y": 1.5, "matrix": [1, 6] },
+                { "x": 7, "y": 1.5, "matrix": [1, 7] },
+                { "x": 8, "y": 1.5, "matrix": [1, 8] },
+                { "x": 9, "y": 1.5, "matrix": [7, 8] },
+                { "x": 10, "y": 1.5, "matrix": [7, 0] },
+                { "x": 11, "y": 1.5, "matrix": [7, 7] },
+                { "x": 12, "y": 1.5, "matrix": [7, 5] },
+                { "x": 13, "y": 1.5, "matrix": [7, 4] },
+                { "x": 14, "y": 1.5, "matrix": [7, 3] },
+
+                { "x": 15.25, "y": 1.5, "matrix": [7, 6] },
+                { "x": 16.25, "y": 1.5, "matrix": [7, 2] },
+                { "x": 17.25, "y": 1.5, "matrix": [7, 1] },
+
+                { "x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0] },
+                { "x": 1.5, "y": 2.5, "matrix": [2, 1] },
+                { "x": 2.5, "y": 2.5, "matrix": [2, 2] },
+                { "x": 3.5, "y": 2.5, "matrix": [2, 3] },
+                { "x": 4.5, "y": 2.5, "matrix": [2, 4] },
+                { "x": 5.5, "y": 2.5, "matrix": [2, 5] },
+                { "x": 6.5, "y": 2.5, "matrix": [2, 6] },
+                { "x": 7.5, "y": 2.5, "matrix": [2, 7] },
+                { "x": 8.5, "y": 2.5, "matrix": [2, 8] },
+                { "x": 9.5, "y": 2.5, "matrix": [8, 8] },
+                { "x": 10.5, "y": 2.5, "matrix": [8, 7] },
+                { "x": 11.5, "y": 2.5, "matrix": [8, 5] },
+                { "x": 12.5, "y": 2.5, "matrix": [8, 4] },
+                { "x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4] },
+
+                { "x": 15.25, "y": 2.5, "matrix": [8, 6] },
+                { "x": 16.25, "y": 2.5, "matrix": [8, 2] },
+                { "x": 17.25, "y": 2.5, "matrix": [8, 1] },
+
+                { "x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0] },
+                { "x": 1.75, "y": 3.5, "matrix": [3, 1] },
+                { "x": 2.75, "y": 3.5, "matrix": [3, 2] },
+                { "x": 3.75, "y": 3.5, "matrix": [3, 3] },
+                { "x": 4.75, "y": 3.5, "matrix": [3, 4] },
+                { "x": 5.75, "y": 3.5, "matrix": [3, 5] },
+                { "x": 6.75, "y": 3.5, "matrix": [3, 6] },
+                { "x": 7.75, "y": 3.5, "matrix": [3, 7] },
+                { "x": 8.75, "y": 3.5, "matrix": [3, 8] },
+                { "x": 9.75, "y": 3.5, "matrix": [9, 8] },
+                { "x": 10.75, "y": 3.5, "matrix": [9, 7] },
+                { "x": 11.75, "y": 3.5, "matrix": [9, 5] },
+                { "x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3] },
+
+                { "x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0] },
+                { "x": 1.25, "y": 4.5, "matrix": [4, 1] },
+                { "x": 2.25, "y": 4.5, "matrix": [4, 2] },
+                { "x": 3.25, "y": 4.5, "matrix": [4, 3] },
+                { "x": 4.25, "y": 4.5, "matrix": [4, 4] },
+                { "x": 5.25, "y": 4.5, "matrix": [4, 5] },
+                { "x": 6.25, "y": 4.5, "matrix": [4, 6] },
+                { "x": 7.25, "y": 4.5, "matrix": [4, 7] },
+                { "x": 8.25, "y": 4.5, "matrix": [4, 8] },
+                { "x": 9.25, "y": 4.5, "matrix": [10, 8] },
+                { "x": 10.25, "y": 4.5, "matrix": [10, 7] },
+                { "x": 11.25, "y": 4.5, "matrix": [10, 5] },
+                { "x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4] },
+                { "x": 14, "y": 4.5, "matrix": [10, 3] },
+
+                { "x": 16.25, "y": 4.5, "matrix": [9, 2] },
+
+                { "x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0] },
+                { "x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1] },
+                { "x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2] },
+                { "x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6] },
+                { "x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8] },
+                { "x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7] },
+                { "x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4] },
+                { "x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3] },
+
+                { "x": 15.25, "y": 5.5, "matrix": [10, 6] },
+                { "x": 16.25, "y": 5.5, "matrix": [10, 2] },
+                { "x": 17.25, "y": 5.5, "matrix": [10, 1] }
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-              { "label": "Esc", "x": 0, "y": 0 },
-              { "label": "F1", "x": 2, "y": 0 },
-              { "label": "F2", "x": 3, "y": 0 },
-              { "label": "F3", "x": 4, "y": 0 },
-              { "label": "F4", "x": 5, "y": 0 },
-              { "label": "F5", "x": 6.5, "y": 0 },
-              { "label": "F6", "x": 7.5, "y": 0 },
-              { "label": "F7", "x": 8.5, "y": 0 },
-              { "label": "F8", "x": 9.5, "y": 0 },
-              { "label": "F9", "x": 11, "y": 0 },
-              { "label": "F10", "x": 12, "y": 0 },
-              { "label": "F11", "x": 13, "y": 0 },
-              { "label": "F12", "x": 14, "y": 0 },
-              { "label": "Print Screen", "x": 15.25, "y": 0 },
-              { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-              { "label": "Pause", "x": 17.25, "y": 0 },
-              { "label": "`", "x": 0, "y": 1.25 },
-              { "label": "1", "x": 1, "y": 1.25 },
-              { "label": "2", "x": 2, "y": 1.25 },
-              { "label": "3", "x": 3, "y": 1.25 },
-              { "label": "4", "x": 4, "y": 1.25 },
-              { "label": "5", "x": 5, "y": 1.25 },
-              { "label": "6", "x": 6, "y": 1.25 },
-              { "label": "7", "x": 7, "y": 1.25 },
-              { "label": "8", "x": 8, "y": 1.25 },
-              { "label": "9", "x": 9, "y": 1.25 },
-              { "label": "0", "x": 10, "y": 1.25 },
-              { "label": "-", "x": 11, "y": 1.25 },
-              { "label": "=", "x": 12, "y": 1.25 },
-              { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-              { "label": "Insert", "x": 15.25, "y": 1.25 },
-              { "label": "Home", "x": 16.25, "y": 1.25 },
-              { "label": "PgUp", "x": 17.25, "y": 1.25 },
-              { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-              { "label": "Q", "x": 1.5, "y": 2.25 },
-              { "label": "W", "x": 2.5, "y": 2.25 },
-              { "label": "E", "x": 3.5, "y": 2.25 },
-              { "label": "R", "x": 4.5, "y": 2.25 },
-              { "label": "T", "x": 5.5, "y": 2.25 },
-              { "label": "Y", "x": 6.5, "y": 2.25 },
-              { "label": "U", "x": 7.5, "y": 2.25 },
-              { "label": "I", "x": 8.5, "y": 2.25 },
-              { "label": "O", "x": 9.5, "y": 2.25 },
-              { "label": "P", "x": 10.5, "y": 2.25 },
-              { "label": "[", "x": 11.5, "y": 2.25 },
-              { "label": "]", "x": 12.5, "y": 2.25 },
-              { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-              { "label": "Delete", "x": 15.25, "y": 2.25 },
-              { "label": "End", "x": 16.25, "y": 2.25 },
-              { "label": "PgDn", "x": 17.25, "y": 2.25 },
-              { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-              { "label": "A", "x": 1.75, "y": 3.25 },
-              { "label": "S", "x": 2.75, "y": 3.25 },
-              { "label": "D", "x": 3.75, "y": 3.25 },
-              { "label": "F", "x": 4.75, "y": 3.25 },
-              { "label": "G", "x": 5.75, "y": 3.25 },
-              { "label": "H", "x": 6.75, "y": 3.25 },
-              { "label": "J", "x": 7.75, "y": 3.25 },
-              { "label": "K", "x": 8.75, "y": 3.25 },
-              { "label": "L", "x": 9.75, "y": 3.25 },
-              { "label": ";", "x": 10.75, "y": 3.25 },
-              { "label": "'", "x": 11.75, "y": 3.25 },
-              { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-              { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-              { "label": "Z", "x": 2.25, "y": 4.25 },
-              { "label": "X", "x": 3.25, "y": 4.25 },
-              { "label": "C", "x": 4.25, "y": 4.25 },
-              { "label": "V", "x": 5.25, "y": 4.25 },
-              { "label": "B", "x": 6.25, "y": 4.25 },
-              { "label": "N", "x": 7.25, "y": 4.25 },
-              { "label": "M", "x": 8.25, "y": 4.25 },
-              { "label": ",", "x": 9.25, "y": 4.25 },
-              { "label": ".", "x": 10.25, "y": 4.25 },
-              { "label": "/", "x": 11.25, "y": 4.25 },
-              { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-              { "label": "Up", "x": 16.25, "y": 4.25 },
-              { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-              { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-              { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-              { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
-              { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-              { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-              { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-              { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-              { "label": "Left", "x": 15.25, "y": 5.25 },
-              { "label": "Down", "x": 16.25, "y": 5.25 },
-              { "label": "Right", "x": 17.25, "y": 5.25 }
+                { "x": 0, "y": 0, "matrix": [0, 0] },
+
+                { "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": [6, 8] },
+
+                { "x": 11, "y": 0, "matrix": [6, 7] },
+                { "x": 12, "y": 0, "matrix": [6, 5] },
+                { "x": 13, "y": 0, "matrix": [6, 4] },
+                { "x": 14, "y": 0, "matrix": [6, 3] },
+
+                { "x": 15.25, "y": 0, "matrix": [6, 6] },
+                { "x": 16.25, "y": 0, "matrix": [6, 2] },
+                { "x": 17.25, "y": 0, "matrix": [6, 1] },
+
+                { "x": 0, "y": 1.25, "matrix": [1, 0] },
+                { "x": 1, "y": 1.25, "matrix": [1, 1] },
+                { "x": 2, "y": 1.25, "matrix": [1, 2] },
+                { "x": 3, "y": 1.25, "matrix": [1, 3] },
+                { "x": 4, "y": 1.25, "matrix": [1, 4] },
+                { "x": 5, "y": 1.25, "matrix": [1, 5] },
+                { "x": 6, "y": 1.25, "matrix": [1, 6] },
+                { "x": 7, "y": 1.25, "matrix": [1, 7] },
+                { "x": 8, "y": 1.25, "matrix": [1, 8] },
+                { "x": 9, "y": 1.25, "matrix": [7, 8] },
+                { "x": 10, "y": 1.25, "matrix": [7, 0] },
+                { "x": 11, "y": 1.25, "matrix": [7, 7] },
+                { "x": 12, "y": 1.25, "matrix": [7, 5] },
+                { "x": 13, "y": 1.25, "w": 2, "matrix": [7, 3] },
+
+                { "x": 15.25, "y": 1.25, "matrix": [7, 6] },
+                { "x": 16.25, "y": 1.25, "matrix": [7, 2] },
+                { "x": 17.25, "y": 1.25, "matrix": [7, 1] },
+
+                { "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0] },
+                { "x": 1.5, "y": 2.25, "matrix": [2, 1] },
+                { "x": 2.5, "y": 2.25, "matrix": [2, 2] },
+                { "x": 3.5, "y": 2.25, "matrix": [2, 3] },
+                { "x": 4.5, "y": 2.25, "matrix": [2, 4] },
+                { "x": 5.5, "y": 2.25, "matrix": [2, 5] },
+                { "x": 6.5, "y": 2.25, "matrix": [2, 6] },
+                { "x": 7.5, "y": 2.25, "matrix": [2, 7] },
+                { "x": 8.5, "y": 2.25, "matrix": [2, 8] },
+                { "x": 9.5, "y": 2.25, "matrix": [8, 8] },
+                { "x": 10.5, "y": 2.25, "matrix": [8, 7] },
+                { "x": 11.5, "y": 2.25, "matrix": [8, 5] },
+                { "x": 12.5, "y": 2.25, "matrix": [8, 4] },
+                { "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4] },
+
+                { "x": 15.25, "y": 2.25, "matrix": [8, 6] },
+                { "x": 16.25, "y": 2.25, "matrix": [8, 2] },
+                { "x": 17.25, "y": 2.25, "matrix": [8, 1] },
+
+                { "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0] },
+                { "x": 1.75, "y": 3.25, "matrix": [3, 1] },
+                { "x": 2.75, "y": 3.25, "matrix": [3, 2] },
+                { "x": 3.75, "y": 3.25, "matrix": [3, 3] },
+                { "x": 4.75, "y": 3.25, "matrix": [3, 4] },
+                { "x": 5.75, "y": 3.25, "matrix": [3, 5] },
+                { "x": 6.75, "y": 3.25, "matrix": [3, 6] },
+                { "x": 7.75, "y": 3.25, "matrix": [3, 7] },
+                { "x": 8.75, "y": 3.25, "matrix": [3, 8] },
+                { "x": 9.75, "y": 3.25, "matrix": [9, 8] },
+                { "x": 10.75, "y": 3.25, "matrix": [9, 7] },
+                { "x": 11.75, "y": 3.25, "matrix": [9, 5] },
+                { "x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3] },
+
+                { "x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0] },
+                { "x": 2.25, "y": 4.25, "matrix": [4, 2] },
+                { "x": 3.25, "y": 4.25, "matrix": [4, 3] },
+                { "x": 4.25, "y": 4.25, "matrix": [4, 4] },
+                { "x": 5.25, "y": 4.25, "matrix": [4, 5] },
+                { "x": 6.25, "y": 4.25, "matrix": [4, 6] },
+                { "x": 7.25, "y": 4.25, "matrix": [4, 7] },
+                { "x": 8.25, "y": 4.25, "matrix": [4, 8] },
+                { "x": 9.25, "y": 4.25, "matrix": [10, 8] },
+                { "x": 10.25, "y": 4.25, "matrix": [10, 7] },
+                { "x": 11.25, "y": 4.25, "matrix": [10, 5] },
+                { "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4] },
+
+                { "x": 16.25, "y": 4.25, "matrix": [9, 2] },
+
+                { "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0] },
+                { "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1] },
+                { "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2] },
+                { "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6] },
+                { "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8] },
+                { "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7] },
+                { "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4] },
+                { "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3] },
+                { "x": 15.25, "y": 5.25, "matrix": [10, 6] },
+                { "x": 16.25, "y": 5.25, "matrix": [10, 2] },
+                { "x": 17.25, "y": 5.25, "matrix": [10, 1] }
             ]
-          },
-          "LAYOUT_tkl_iso": {
+        },
+        "LAYOUT_tkl_iso": {
             "layout": [
-              { "label": "Esc", "x": 0, "y": 0 },
-              { "label": "F1", "x": 2, "y": 0 },
-              { "label": "F2", "x": 3, "y": 0 },
-              { "label": "F3", "x": 4, "y": 0 },
-              { "label": "F4", "x": 5, "y": 0 },
-              { "label": "F5", "x": 6.5, "y": 0 },
-              { "label": "F6", "x": 7.5, "y": 0 },
-              { "label": "F7", "x": 8.5, "y": 0 },
-              { "label": "F8", "x": 9.5, "y": 0 },
-              { "label": "F9", "x": 11, "y": 0 },
-              { "label": "F10", "x": 12, "y": 0 },
-              { "label": "F11", "x": 13, "y": 0 },
-              { "label": "F12", "x": 14, "y": 0 },
-              { "label": "Print Screen", "x": 15.25, "y": 0 },
-              { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-              { "label": "Pause", "x": 17.25, "y": 0 },
-              { "label": "`", "x": 0, "y": 1.25 },
-              { "label": "1", "x": 1, "y": 1.25 },
-              { "label": "2", "x": 2, "y": 1.25 },
-              { "label": "3", "x": 3, "y": 1.25 },
-              { "label": "4", "x": 4, "y": 1.25 },
-              { "label": "5", "x": 5, "y": 1.25 },
-              { "label": "6", "x": 6, "y": 1.25 },
-              { "label": "7", "x": 7, "y": 1.25 },
-              { "label": "8", "x": 8, "y": 1.25 },
-              { "label": "9", "x": 9, "y": 1.25 },
-              { "label": "0", "x": 10, "y": 1.25 },
-              { "label": "-", "x": 11, "y": 1.25 },
-              { "label": "=", "x": 12, "y": 1.25 },
-              { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
-              { "label": "Insert", "x": 15.25, "y": 1.25 },
-              { "label": "Home", "x": 16.25, "y": 1.25 },
-              { "label": "PgUp", "x": 17.25, "y": 1.25 },
-              { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-              { "label": "Q", "x": 1.5, "y": 2.25 },
-              { "label": "W", "x": 2.5, "y": 2.25 },
-              { "label": "E", "x": 3.5, "y": 2.25 },
-              { "label": "R", "x": 4.5, "y": 2.25 },
-              { "label": "T", "x": 5.5, "y": 2.25 },
-              { "label": "Y", "x": 6.5, "y": 2.25 },
-              { "label": "U", "x": 7.5, "y": 2.25 },
-              { "label": "I", "x": 8.5, "y": 2.25 },
-              { "label": "O", "x": 9.5, "y": 2.25 },
-              { "label": "P", "x": 10.5, "y": 2.25 },
-              { "label": "[", "x": 11.5, "y": 2.25 },
-              { "label": "]", "x": 12.5, "y": 2.25 },
-              { "label": "Delete", "x": 15.25, "y": 2.25 },
-              { "label": "End", "x": 16.25, "y": 2.25 },
-              { "label": "PgDn", "x": 17.25, "y": 2.25 },
-              { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-              { "label": "A", "x": 1.75, "y": 3.25 },
-              { "label": "S", "x": 2.75, "y": 3.25 },
-              { "label": "D", "x": 3.75, "y": 3.25 },
-              { "label": "F", "x": 4.75, "y": 3.25 },
-              { "label": "G", "x": 5.75, "y": 3.25 },
-              { "label": "H", "x": 6.75, "y": 3.25 },
-              { "label": "J", "x": 7.75, "y": 3.25 },
-              { "label": "K", "x": 8.75, "y": 3.25 },
-              { "label": "L", "x": 9.75, "y": 3.25 },
-              { "label": ";", "x": 10.75, "y": 3.25 },
-              { "label": "'", "x": 11.75, "y": 3.25 },
-              { "label": "#", "x": 12.75, "y": 3.25 },
-              { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
-              { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-              { "label": "\\", "x": 1.25, "y": 4.25 },
-              { "label": "Z", "x": 2.25, "y": 4.25 },
-              { "label": "X", "x": 3.25, "y": 4.25 },
-              { "label": "C", "x": 4.25, "y": 4.25 },
-              { "label": "V", "x": 5.25, "y": 4.25 },
-              { "label": "B", "x": 6.25, "y": 4.25 },
-              { "label": "N", "x": 7.25, "y": 4.25 },
-              { "label": "M", "x": 8.25, "y": 4.25 },
-              { "label": ",", "x": 9.25, "y": 4.25 },
-              { "label": ".", "x": 10.25, "y": 4.25 },
-              { "label": "/", "x": 11.25, "y": 4.25 },
-              { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-              { "label": "Up", "x": 16.25, "y": 4.25 },
-              { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-              { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-              { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-              { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
-              { "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25 },
-              { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-              { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-              { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-              { "label": "Left", "x": 15.25, "y": 5.25 },
-              { "label": "Down", "x": 16.25, "y": 5.25 },
-              { "label": "Right", "x": 17.25, "y": 5.25 }
+                { "x": 0, "y": 0, "matrix": [0, 0] },
+
+                { "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": [6, 8] },
+
+                { "x": 11, "y": 0, "matrix": [6, 7] },
+                { "x": 12, "y": 0, "matrix": [6, 5] },
+                { "x": 13, "y": 0, "matrix": [6, 4] },
+                { "x": 14, "y": 0, "matrix": [6, 3] },
+
+                { "x": 15.25, "y": 0, "matrix": [6, 6] },
+                { "x": 16.25, "y": 0, "matrix": [6, 2] },
+                { "x": 17.25, "y": 0, "matrix": [6, 1] },
+
+                { "x": 0, "y": 1.25, "matrix": [1, 0] },
+                { "x": 1, "y": 1.25, "matrix": [1, 1] },
+                { "x": 2, "y": 1.25, "matrix": [1, 2] },
+                { "x": 3, "y": 1.25, "matrix": [1, 3] },
+                { "x": 4, "y": 1.25, "matrix": [1, 4] },
+                { "x": 5, "y": 1.25, "matrix": [1, 5] },
+                { "x": 6, "y": 1.25, "matrix": [1, 6] },
+                { "x": 7, "y": 1.25, "matrix": [1, 7] },
+                { "x": 8, "y": 1.25, "matrix": [1, 8] },
+                { "x": 9, "y": 1.25, "matrix": [7, 8] },
+                { "x": 10, "y": 1.25, "matrix": [7, 0] },
+                { "x": 11, "y": 1.25, "matrix": [7, 7] },
+                { "x": 12, "y": 1.25, "matrix": [7, 5] },
+                { "x": 13, "y": 1.25, "w": 2, "matrix": [7, 3] },
+
+                { "x": 15.25, "y": 1.25, "matrix": [7, 6] },
+                { "x": 16.25, "y": 1.25, "matrix": [7, 2] },
+                { "x": 17.25, "y": 1.25, "matrix": [7, 1] },
+
+                { "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0] },
+                { "x": 1.5, "y": 2.25, "matrix": [2, 1] },
+                { "x": 2.5, "y": 2.25, "matrix": [2, 2] },
+                { "x": 3.5, "y": 2.25, "matrix": [2, 3] },
+                { "x": 4.5, "y": 2.25, "matrix": [2, 4] },
+                { "x": 5.5, "y": 2.25, "matrix": [2, 5] },
+                { "x": 6.5, "y": 2.25, "matrix": [2, 6] },
+                { "x": 7.5, "y": 2.25, "matrix": [2, 7] },
+                { "x": 8.5, "y": 2.25, "matrix": [2, 8] },
+                { "x": 9.5, "y": 2.25, "matrix": [8, 8] },
+                { "x": 10.5, "y": 2.25, "matrix": [8, 7] },
+                { "x": 11.5, "y": 2.25, "matrix": [8, 5] },
+                { "x": 12.5, "y": 2.25, "matrix": [8, 4] },
+
+                { "x": 15.25, "y": 2.25, "matrix": [8, 6] },
+                { "x": 16.25, "y": 2.25, "matrix": [8, 2] },
+                { "x": 17.25, "y": 2.25, "matrix": [8, 1] },
+
+                { "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0] },
+                { "x": 1.75, "y": 3.25, "matrix": [3, 1] },
+                { "x": 2.75, "y": 3.25, "matrix": [3, 2] },
+                { "x": 3.75, "y": 3.25, "matrix": [3, 3] },
+                { "x": 4.75, "y": 3.25, "matrix": [3, 4] },
+                { "x": 5.75, "y": 3.25, "matrix": [3, 5] },
+                { "x": 6.75, "y": 3.25, "matrix": [3, 6] },
+                { "x": 7.75, "y": 3.25, "matrix": [3, 7] },
+                { "x": 8.75, "y": 3.25, "matrix": [3, 8] },
+                { "x": 9.75, "y": 3.25, "matrix": [9, 8] },
+                { "x": 10.75, "y": 3.25, "matrix": [9, 7] },
+                { "x": 11.75, "y": 3.25, "matrix": [9, 5] },
+                { "x": 12.75, "y": 3.25, "matrix": [9, 4] },
+                { "x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3] },
+
+                { "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0] },
+                { "x": 1.25, "y": 4.25, "matrix": [4, 1] },
+                { "x": 2.25, "y": 4.25, "matrix": [4, 2] },
+                { "x": 3.25, "y": 4.25, "matrix": [4, 3] },
+                { "x": 4.25, "y": 4.25, "matrix": [4, 4] },
+                { "x": 5.25, "y": 4.25, "matrix": [4, 5] },
+                { "x": 6.25, "y": 4.25, "matrix": [4, 6] },
+                { "x": 7.25, "y": 4.25, "matrix": [4, 7] },
+                { "x": 8.25, "y": 4.25, "matrix": [4, 8] },
+                { "x": 9.25, "y": 4.25, "matrix": [10, 8] },
+                { "x": 10.25, "y": 4.25, "matrix": [10, 7] },
+                { "x": 11.25, "y": 4.25, "matrix": [10, 5] },
+                { "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4] },
+
+                { "x": 16.25, "y": 4.25, "matrix": [9, 2] },
+
+                { "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0] },
+                { "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1] },
+                { "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2] },
+                { "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6] },
+                { "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8] },
+                { "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7] },
+                { "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4] },
+                { "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3] },
+
+                { "x": 15.25, "y": 5.25, "matrix": [10, 6] },
+                { "x": 16.25, "y": 5.25, "matrix": [10, 2] },
+                { "x": 17.25, "y": 5.25, "matrix": [10, 1] }
             ]
-          }
+        }
     }
 }
diff --git a/keyboards/mt/ncr80/solder/solder.c b/keyboards/mt/ncr80/solder/solder.c
deleted file mode 100644
index a9095bd2e5..0000000000
--- a/keyboards/mt/ncr80/solder/solder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 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/>.
-*/
-
-#include "solder.h"
diff --git a/keyboards/mt/ncr80/solder/solder.h b/keyboards/mt/ncr80/solder/solder.h
deleted file mode 100644
index 2114b6031a..0000000000
--- a/keyboards/mt/ncr80/solder/solder.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2022 Jordan Duabe
- * Copyright 2022 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/>.
- */
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63,      K66, K62, K61, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73,       K76, K72, K71, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94,           K86, K82, K81, \
-      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,   KA3,               K92, \
-    K50, K51, K52,            K56,                      K58, K57, K54, K53,          KA6, KA2, KA1  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
-    { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
-    { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
-    { XXX, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8 }, \
-}
-
-#define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63,      K66, K62, K61, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,            K76, K72, K71, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84,                K86, K82, K81, \
-      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94, K83, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                      K92, \
-    K50, K51, K52,            K56,                      K58, K57, K54, K53,          KA6, KA2, KA1  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
-    { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
-    { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
-    { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05,    K06, K07, K08, K68,    K67, K65, K64, K63,      K66, K62, K61, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,            K76, K72, K71, \
-     K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94,           K86, K82, K81, \
-      K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
-    K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                           K92, \
-    K50, K51, K52,            K56,                      K58, K57, K54, K53,          KA6, KA2, KA1  \
-) { \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
-    { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
-    { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
-    { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
-    { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
-}
-