Move miscellaneous layouts to data driven (#20516)

4 files changed, 369 insertions, 457 deletions

diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.h b/keyboards/alfredslab/swift65/hotswap/hotswap.h
deleted file mode 100644
index ab9c3d8250..0000000000
--- a/keyboards/alfredslab/swift65/hotswap/hotswap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Steven Phillips (spooknik)
- *
- * 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
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42, K46, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E }, \
-}
diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json
index 2e7f9bf2c2..e246fcc85f 100644
--- a/keyboards/alfredslab/swift65/hotswap/info.json
+++ b/keyboards/alfredslab/swift65/hotswap/info.json
@@ -25,71 +25,79 @@
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [
-                { "label": "K00 (B1,F7)", "x": 0, "y": 0 },
-                { "label": "K01 (B1,F6)", "x": 1, "y": 0 },
-                { "label": "K02 (B1,F5)", "x": 2, "y": 0 },
-                { "label": "K03 (B1,F4)", "x": 3, "y": 0 },
-                { "label": "K04 (B1,F1)", "x": 4, "y": 0 },
-                { "label": "K05 (B1,F0)", "x": 5, "y": 0 },
-                { "label": "K06 (B1,C7)", "x": 6, "y": 0 },
-                { "label": "K07 (B1,C6)", "x": 7, "y": 0 },
-                { "label": "K08 (B1,B6)", "x": 8, "y": 0 },
-                { "label": "K09 (B1,B5)", "x": 9, "y": 0 },
-                { "label": "K0A (B1,B4)", "x": 10, "y": 0 },
-                { "label": "K0B (B1,D7)", "x": 11, "y": 0 },
-                { "label": "K0C (B1,D5)", "x": 12, "y": 0 },
-                { "label": "K0D (B1,D3)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K0E (B1,D1)", "x": 15.25, "y": 0 },
-                { "label": "K10 (B2,F7)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (B2,F6)", "x": 1.5, "y": 1 },
-                { "label": "K12 (B2,F5)", "x": 2.5, "y": 1 },
-                { "label": "K13 (B2,F4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (B2,F1)", "x": 4.5, "y": 1 },
-                { "label": "K15 (B2,F0)", "x": 5.5, "y": 1 },
-                { "label": "K16 (B2,C7)", "x": 6.5, "y": 1 },
-                { "label": "K17 (B2,C6)", "x": 7.5, "y": 1 },
-                { "label": "K18 (B2,B6)", "x": 8.5, "y": 1 },
-                { "label": "K19 (B2,B5)", "x": 9.5, "y": 1 },
-                { "label": "K1A (B2,B4)", "x": 10.5, "y": 1 },
-                { "label": "K1B (B2,D7)", "x": 11.5, "y": 1 },
-                { "label": "K1C (B2,D5)", "x": 12.5, "y": 1 },
-                { "label": "K1D (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (B2,D1)", "x": 15.25, "y": 1 },
-                { "label": "K20 (B3,F7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (B3,F6)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B3,F5)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B3,F4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B3,F1)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B3,F0)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B3,C7)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B3,C6)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B3,B6)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B3,B5)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B3,B4)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B3,D7)", "x": 11.75, "y": 2 },
-                { "label": "K2D (B3,D3)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (B3,D1)", "x": 15.25, "y": 2 },
-                { "label": "K31 (D6,F6)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
-                { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
-                { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
-                { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
-                { "label": "K36 (D6,C7)", "x": 6.25, "y": 3 },
-                { "label": "K37 (D6,C6)", "x": 7.25, "y": 3 },
-                { "label": "K38 (D6,B6)", "x": 8.25, "y": 3 },
-                { "label": "K39 (D6,B5)", "x": 9.25, "y": 3 },
-                { "label": "K3A (D6,B4)", "x": 10.25, "y": 3 },
-                { "label": "K3B (D6,D7)", "x": 11.25, "y": 3 },
-                { "label": "K3C (D6,D5)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (D6,D3)", "x": 14, "y": 3 },
-                { "label": "K40 (D4,F7)", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "K41 (D4,F6)", "x": 1.5, "y": 4},
-                { "label": "K42 (D4,F5)", "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "K46 (D4,C7)", "x": 4, "y": 4, "w": 7},
-                { "label": "K4B (D4,D7)", "x": 11, "y": 4, "w": 1.5 },
-                { "label": "K4C (D4,D5)", "x": 13, "y": 4 },
-                { "label": "K4D (D4,D3)", "x": 14, "y": 4 },
-                { "label": "K4E (D4,D1)", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "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, 14], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 1], "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": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json
index 79583e099c..abaaf12353 100644
--- a/keyboards/alfredslab/swift65/solder/info.json
+++ b/keyboards/alfredslab/swift65/solder/info.json
@@ -25,298 +25,314 @@
     "layouts": {
         "LAYOUT_625u_space": {
             "layout": [
-                {"label":"K00 (B1,F7)", "x":0, "y":0},
-                {"label":"K01 (B1,F6)", "x":1, "y":0},
-                {"label":"K02 (B1,F5)", "x":2, "y":0},
-                {"label":"K03 (B1,F4)", "x":3, "y":0},
-                {"label":"K04 (B1,F1)", "x":4, "y":0},
-                {"label":"K05 (B1,F0)", "x":5, "y":0},
-                {"label":"K06 (B1,C7)", "x":6, "y":0},
-                {"label":"K07 (B1,C6)", "x":7, "y":0},
-                {"label":"K08 (B1,B6)", "x":8, "y":0},
-                {"label":"K09 (B1,B5)", "x":9, "y":0},
-                {"label":"K0A (B1,B4)", "x":10, "y":0},
-                {"label":"K0B (B1,D7)", "x":11, "y":0},
-                {"label":"K0C (B1,D5)", "x":12, "y":0},
-                {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
-                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
-                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
-                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
-                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
-                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
-                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
-                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
-                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
-                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
-                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
-                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
-                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
-                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
-                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
-                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
-                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
-                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
-                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
-                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
-                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
-                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
-                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
-                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
-                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
-                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
-                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
-                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
-                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
-                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
-                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
-                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
-                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
-                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
-                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
-                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (D4,D3)", "x":14, "y":3},
-
-                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (D6,D5)", "x":13, "y":4},
-                {"label":"K4D (D6,D3)", "x":14, "y":4},
-                {"label":"K4E (D6,D1)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "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, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_625u_space_split_bs": {
             "layout": [
-                {"label":"K00 (B1,F7)", "x":0, "y":0},
-                {"label":"K01 (B1,F6)", "x":1, "y":0},
-                {"label":"K02 (B1,F5)", "x":2, "y":0},
-                {"label":"K03 (B1,F4)", "x":3, "y":0},
-                {"label":"K04 (B1,F1)", "x":4, "y":0},
-                {"label":"K05 (B1,F0)", "x":5, "y":0},
-                {"label":"K06 (B1,C7)", "x":6, "y":0},
-                {"label":"K07 (B1,C6)", "x":7, "y":0},
-                {"label":"K08 (B1,B6)", "x":8, "y":0},
-                {"label":"K09 (B1,B5)", "x":9, "y":0},
-                {"label":"K0A (B1,B4)", "x":10, "y":0},
-                {"label":"K0B (B1,D7)", "x":11, "y":0},
-                {"label":"K0C (B1,D5)", "x":12, "y":0},
-                {"label":"K0D (B1,D3)", "x":13, "y":0},
-                {"label":"K0F (B1,D0)", "x":14, "y":0},
-                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
-                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
-                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
-                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
-                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
-                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
-                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
-                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
-                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
-                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
-                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
-                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
-                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
-                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
-                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
-                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
-                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
-                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
-                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
-                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
-                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
-                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
-                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
-                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
-                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
-                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
-                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
-                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
-                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
-                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
-                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
-                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
-                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
-                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
-                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
-                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (D4,D3)", "x":14, "y":3},
-
-                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C (D6,D5)", "x":13, "y":4},
-                {"label":"K4D (D6,D3)", "x":14, "y":4},
-                {"label":"K4E (D6,D1)", "x":15, "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": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "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, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "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": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                {"label":"K00 (B1,F7)", "x":0, "y":0},
-                {"label":"K01 (B1,F6)", "x":1, "y":0},
-                {"label":"K02 (B1,F5)", "x":2, "y":0},
-                {"label":"K03 (B1,F4)", "x":3, "y":0},
-                {"label":"K04 (B1,F1)", "x":4, "y":0},
-                {"label":"K05 (B1,F0)", "x":5, "y":0},
-                {"label":"K06 (B1,C7)", "x":6, "y":0},
-                {"label":"K07 (B1,C6)", "x":7, "y":0},
-                {"label":"K08 (B1,B6)", "x":8, "y":0},
-                {"label":"K09 (B1,B5)", "x":9, "y":0},
-                {"label":"K0A (B1,B4)", "x":10, "y":0},
-                {"label":"K0B (B1,D7)", "x":11, "y":0},
-                {"label":"K0C (B1,D5)", "x":12, "y":0},
-                {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2},
-                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
-                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
-                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
-                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
-                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
-                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
-                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
-                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
-                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
-                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
-                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
-                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
-                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
-                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
-                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
-                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
-                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
-                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
-                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
-                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
-                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
-                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
-                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
-                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
-                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
-                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
-                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
-                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
-                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
-                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
-                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
-                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
-                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
-                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
-                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
-                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (D4,D3)", "x":14, "y":3},
-
-                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
-                {"label":"K41 (D6,F6)", "x":1.5, "y":4},
-                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
-                {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
-                {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
-                {"label":"K4C (D6,D5)", "x":13, "y":4},
-                {"label":"K4D (D6,D3)", "x":14, "y":4},
-                {"label":"K4E (D6,D1)", "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 15.25, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "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, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "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": [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": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_7u_space_split_bs": {
             "layout": [
-                {"label":"K00 (B1,F7)", "x":0, "y":0},
-                {"label":"K01 (B1,F6)", "x":1, "y":0},
-                {"label":"K02 (B1,F5)", "x":2, "y":0},
-                {"label":"K03 (B1,F4)", "x":3, "y":0},
-                {"label":"K04 (B1,F1)", "x":4, "y":0},
-                {"label":"K05 (B1,F0)", "x":5, "y":0},
-                {"label":"K06 (B1,C7)", "x":6, "y":0},
-                {"label":"K07 (B1,C6)", "x":7, "y":0},
-                {"label":"K08 (B1,B6)", "x":8, "y":0},
-                {"label":"K09 (B1,B5)", "x":9, "y":0},
-                {"label":"K0A (B1,B4)", "x":10, "y":0},
-                {"label":"K0B (B1,D7)", "x":11, "y":0},
-                {"label":"K0C (B1,D5)", "x":12, "y":0},
-                {"label":"K0D (B1,D3)", "x":13, "y":0},
-                {"label":"K0F (B1,D0)", "x":14, "y":0},
-                {"label":"K0E (B1,D1)", "x":15.25, "y":0},
-
-                {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B2,F6)", "x":1.5, "y":1},
-                {"label":"K12 (B2,F5)", "x":2.5, "y":1},
-                {"label":"K13 (B2,F4)", "x":3.5, "y":1},
-                {"label":"K14 (B2,F1)", "x":4.5, "y":1},
-                {"label":"K15 (B2,F0)", "x":5.5, "y":1},
-                {"label":"K16 (B2,C7)", "x":6.5, "y":1},
-                {"label":"K17 (B2,C6)", "x":7.5, "y":1},
-                {"label":"K18 (B2,B6)", "x":8.5, "y":1},
-                {"label":"K19 (B2,B5)", "x":9.5, "y":1},
-                {"label":"K1A (B2,B4)", "x":10.5, "y":1},
-                {"label":"K1B (B2,D7)", "x":11.5, "y":1},
-                {"label":"K1C (B2,D5)", "x":12.5, "y":1},
-                {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B2,D1)", "x":15.25, "y":1},
-
-                {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B3,F6)", "x":1.75, "y":2},
-                {"label":"K22 (B3,F5)", "x":2.75, "y":2},
-                {"label":"K23 (B3,F4)", "x":3.75, "y":2},
-                {"label":"K24 (B3,F1)", "x":4.75, "y":2},
-                {"label":"K25 (B3,F0)", "x":5.75, "y":2},
-                {"label":"K26 (B3,C7)", "x":6.75, "y":2},
-                {"label":"K27 (B3,C6)", "x":7.75, "y":2},
-                {"label":"K28 (B3,B6)", "x":8.75, "y":2},
-                {"label":"K29 (B3,B5)", "x":9.75, "y":2},
-                {"label":"K2A (B3,B4)", "x":10.75, "y":2},
-                {"label":"K2B (B3,D7)", "x":11.75, "y":2},
-                {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B3,D1)", "x":15.25, "y":2},
-
-                {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25},
-                {"label":"K32 (D4,F5)", "x":2.25, "y":3},
-                {"label":"K33 (D4,F4)", "x":3.25, "y":3},
-                {"label":"K34 (D4,F1)", "x":4.25, "y":3},
-                {"label":"K35 (D4,F0)", "x":5.25, "y":3},
-                {"label":"K36 (D4,C7)", "x":6.25, "y":3},
-                {"label":"K37 (D4,C6)", "x":7.25, "y":3},
-                {"label":"K38 (D4,B6)", "x":8.25, "y":3},
-                {"label":"K39 (D4,B5)", "x":9.25, "y":3},
-                {"label":"K3A (D4,B4)", "x":10.25, "y":3},
-                {"label":"K3B (D4,D7)", "x":11.25, "y":3},
-                {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (D4,D3)", "x":14, "y":3},
-
-                {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5},
-                {"label":"K41 (D6,F6)", "x":1.5, "y":4},
-                {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5},
-                {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7},
-                {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5},
-                {"label":"K4C (D6,D5)", "x":13, "y":4},
-                {"label":"K4D (D6,D3)", "x":14, "y":4},
-                {"label":"K4E (D6,D1)", "x":15, "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": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "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, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.25, "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, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "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": [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": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/alfredslab/swift65/solder/solder.h b/keyboards/alfredslab/swift65/solder/solder.h
deleted file mode 100644
index 651497bec4..0000000000
--- a/keyboards/alfredslab/swift65/solder/solder.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 Steven Phillips (spooknik)
- *
- * 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
-
-#define LAYOUT_625u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E,  \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4C, K4D, K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_625u_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F,  K0E,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E,  \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
-    K40,  K41,  K43,              K46,                K4A,  K4B,     K4C, K4D, K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       K0E,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E,  \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
-    K40,  K41,  K43,              K46,                      K4B,     K4C, K4D, K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F,  K0E,  \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,     K1E,  \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,         K2E,  \
-    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D,        \
-    K40,  K41,  K43,              K46,                      K4B,     K4C, K4D, K4E    \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \
-}