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

2 files changed, 333 insertions, 366 deletions

diff --git a/keyboards/suavity/ehan/ehan.h b/keyboards/suavity/ehan/ehan.h
deleted file mode 100644
index fbc6d33a96..0000000000
--- a/keyboards/suavity/ehan/ehan.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2021 Henry Lum (@suavity)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-/*
- *              ┌───┐┌───┬───┬───┬───┐┌───┐        ┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┐
- *              │00 ││01 │02 │03 │04 ││05 │        │06 │07 │08 │09 ││0A │0B │0C │0D ││0E │0F │0G │
- *              └───┘└───┴───┴───┴───┘└───┘        └───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐      ┌───────┐
- *              │10 │11 │12 │13 │14 │15 │16 │       │17 │18 │19 │1A │1B │1C │1D │3E ││1E │1F │1G │      │3E     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤      └─┬─────┤
- *              │20   │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2C │2D   ││2E │2F │2G │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘     ┌──┴┐3D  │ ISO Enter
- *  LShift      │30    │31 │32 │33 │34 │35 │       │36 │37 │38 │39 │3A │3B │3C      │                  │3C │    │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤    ┌───┐       ┌─┴───┴────┤
- * │40      │   │40  │41 │42 │43 │44 │45 │46 │   │47 │48 │49 │4A │4B │4C │4D    │4E │    │4F │       │4D        │ 2.75u RShift
- * └────────┘   ├────┴┬──┴─┬─┴───┼───┼───┴───┤   ├───┴───┴───┼───┴─┬─┴─┬─┴──┬───┴─┬─┘┌───┼───┼───┐   └──────────┘
- *              │50   │    │53   │54 │55     │   │58         │5A   │5C │    │5D   │  │5E │5F │5G │
- *              └─────┘    └─────┴───┴───────┘   └───────────┴─────┴───┘    └─────┘  └───┴───┴───┘
- *                               ┌───────────┐   ┌──────────┬─────┬────┐
- *                     3u LSpace │55         │   │58        │5A   │5C  │ 2.75u/1.5u/1.25u
- *                               └───────────┘   └──────────┴─────┴────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
-    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___, }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___, }, \
-    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G, }  \
-}
-
-#define LAYOUT_ansi_split_bs_rshift_lspace( \
-    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C, K2D,   K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B,      K3C,                  \
-    K40,      K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
-    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, ___, ___ }, \
-    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___ }, \
-    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
-}
-
-#define LAYOUT_iso_split_bs_rshift_lspace( \
-    K00, K01, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16,   K17, K18, K19, K1A, K1B, K1C, K1D, K3E,   K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B, K2C,        K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35,        K36, K37, K38, K39, K3A, K3B, K3C, K3D,                  \
-    K40, K41, K42, K43, K44, K45, K46,   K47, K48, K49, K4A, K4B, K4C, K4D, K4E,        K4F,      \
-    K50,           K53, K54,      K55,   K58,           K5A, K5C,           K5D,   K5E, K5F, K5G  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F, K2G }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, ___ }, \
-    { K50, ___, ___, K53, K54, K55, ___, ___, K58, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G }  \
-}
diff --git a/keyboards/suavity/ehan/info.json b/keyboards/suavity/ehan/info.json
index 330809655c..8526992376 100755
--- a/keyboards/suavity/ehan/info.json
+++ b/keyboards/suavity/ehan/info.json
@@ -22,305 +22,347 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":8.5, "y":0},
-                {"label":"F7", "x":9.5, "y":0},
-                {"label":"F8", "x":10.5, "y":0},
-                {"label":"F9", "x":11.5, "y":0},
-                {"label":"F10", "x":13, "y":0},
-                {"label":"F11", "x":14, "y":0},
-                {"label":"F12", "x":15, "y":0},
-                {"label":"F13", "x":16, "y":0},
-                {"label":"PrtSc", "x":17.25, "y":0},
-                {"label":"Scroll Lock", "x":18.25, "y":0},
-                {"label":"Pause", "x":19.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":9, "y":1.5},
-                {"label":"8*", "x":10, "y":1.5},
-                {"label":"9(", "x":11, "y":1.5},
-                {"label":"0)", "x":12, "y":1.5},
-                {"label":"-_", "x":13, "y":1.5},
-                {"label":"=+", "x":14, "y":1.5},
-                {"label":"\\|", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5},
-                {"label":"Insert", "x":17.25, "y":1.5},
-                {"label":"Home", "x":18.25, "y":1.5},
-                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
-                {"label":"U", "x":9.5, "y":2.5},
-                {"label":"I", "x":10.5, "y":2.5},
-                {"label":"O", "x":11.5, "y":2.5},
-                {"label":"P", "x":12.5, "y":2.5},
-                {"label":"[{", "x":13.5, "y":2.5},
-                {"label":"]}", "x":14.5, "y":2.5},
-                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":17.25, "y":2.5},
-                {"label":"End", "x":18.25, "y":2.5},
-                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
-                {"label":"J", "x":9.75, "y":3.5},
-                {"label":"K", "x":10.75, "y":3.5},
-                {"label":"L", "x":11.75, "y":3.5},
-                {"label":";:", "x":12.75, "y":3.5},
-                {"label":"'\"", "x":13.75, "y":3.5},
-                {"label":"#~", "x":14.75, "y":3.5},
-                {"label":"Enter", "x":15.75, "y":3.5, "w":1.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.5},
-                {"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":"B", "x":8.25, "y":4.5},
-                {"label":"N", "x":9.25, "y":4.5},
-                {"label":"M", "x":10.25, "y":4.5},
-                {"label":",<", "x":11.25, "y":4.5},
-                {"label":".>", "x":12.25, "y":4.5},
-                {"label":"/?", "x":13.25, "y":4.5},
-                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
-                {"label":"Fn", "x":16, "y":4.5},
-                {"label":"\u2191", "x":18.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":4.25, "y":5.5},
-                {"label":"Space", "x":5.25, "y":5.5, "w":2},
-                {"label":"Space", "x":8.25, "y":5.5, "w":3},
-                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":17.25, "y":5.5},
-                {"label":"\u2193", "x":18.25, "y":5.5},
-                {"label":"\u2193", "x":19.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+                {"matrix": [0, 15], "x": 18.25, "y": 0},
+                {"matrix": [0, 16], "x": 19.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 9, "y": 1.5},
+                {"matrix": [1, 8], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [1, 10], "x": 12, "y": 1.5},
+                {"matrix": [1, 11], "x": 13, "y": 1.5},
+                {"matrix": [1, 12], "x": 14, "y": 1.5},
+                {"matrix": [1, 13], "x": 15, "y": 1.5},
+                {"matrix": [3, 14], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 18.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 19.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 18.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 19.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+
+                {"matrix": [3, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 14], "x": 16, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 5.5, "w": 2},
+
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 3},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 15, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 19.25, "y": 5.5}
             ]
         },
         "LAYOUT_ansi_split_bs_rshift_lspace": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":8.5, "y":0},
-                {"label":"F7", "x":9.5, "y":0},
-                {"label":"F8", "x":10.5, "y":0},
-                {"label":"F9", "x":11.5, "y":0},
-                {"label":"F10", "x":13, "y":0},
-                {"label":"F11", "x":14, "y":0},
-                {"label":"F12", "x":15, "y":0},
-                {"label":"F13", "x":16, "y":0},
-                {"label":"PrtSc", "x":17.25, "y":0},
-                {"label":"Scroll Lock", "x":18.25, "y":0},
-                {"label":"Pause", "x":19.25, "y":0},
-
-                {"label":"`~", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2@", "x":2, "y":1.5},
-                {"label":"3#", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":9, "y":1.5},
-                {"label":"8*", "x":10, "y":1.5},
-                {"label":"9(", "x":11, "y":1.5},
-                {"label":"0)", "x":12, "y":1.5},
-                {"label":"-_", "x":13, "y":1.5},
-                {"label":"=+", "x":14, "y":1.5},
-                {"label":"\\|", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5},
-                {"label":"Insert", "x":17.25, "y":1.5},
-                {"label":"Home", "x":18.25, "y":1.5},
-                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
-                {"label":"U", "x":9.5, "y":2.5},
-                {"label":"I", "x":10.5, "y":2.5},
-                {"label":"O", "x":11.5, "y":2.5},
-                {"label":"P", "x":12.5, "y":2.5},
-                {"label":"[{", "x":13.5, "y":2.5},
-                {"label":"]}", "x":14.5, "y":2.5},
-                {"label":"\\|", "x":15.5, "y":2.5, "w":1.5},
-                {"label":"Delete", "x":17.25, "y":2.5},
-                {"label":"End", "x":18.25, "y":2.5},
-                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
-                {"label":"J", "x":9.75, "y":3.5},
-                {"label":"K", "x":10.75, "y":3.5},
-                {"label":"L", "x":11.75, "y":3.5},
-                {"label":";:", "x":12.75, "y":3.5},
-                {"label":"'\"", "x":13.75, "y":3.5},
-                {"label":"Enter", "x":14.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":"B", "x":8.25, "y":4.5},
-                {"label":"N", "x":9.25, "y":4.5},
-                {"label":"M", "x":10.25, "y":4.5},
-                {"label":",<", "x":11.25, "y":4.5},
-                {"label":".>", "x":12.25, "y":4.5},
-                {"label":"/?", "x":13.25, "y":4.5},
-                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
-                {"label":"Fn", "x":16, "y":4.5},
-                {"label":"\u2191", "x":18.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":4.25, "y":5.5},
-                {"label":"Space", "x":5.25, "y":5.5, "w":2},
-                {"label":"Space", "x":8.25, "y":5.5, "w":3},
-                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":17.25, "y":5.5},
-                {"label":"\u2193", "x":18.25, "y":5.5},
-                {"label":"\u2193", "x":19.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+                {"matrix": [0, 15], "x": 18.25, "y": 0},
+                {"matrix": [0, 16], "x": 19.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 9, "y": 1.5},
+                {"matrix": [1, 8], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [1, 10], "x": 12, "y": 1.5},
+                {"matrix": [1, 11], "x": 13, "y": 1.5},
+                {"matrix": [1, 12], "x": 14, "y": 1.5},
+                {"matrix": [1, 13], "x": 15, "y": 1.5},
+                {"matrix": [3, 14], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 18.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 19.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 18.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 19.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+
+                {"matrix": [3, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 14], "x": 16, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 5.5, "w": 2},
+
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 3},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 15, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 19.25, "y": 5.5}
             ]
         },
         "LAYOUT_iso_split_bs_rshift_lspace": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":8.5, "y":0},
-                {"label":"F7", "x":9.5, "y":0},
-                {"label":"F8", "x":10.5, "y":0},
-                {"label":"F9", "x":11.5, "y":0},
-                {"label":"F10", "x":13, "y":0},
-                {"label":"F11", "x":14, "y":0},
-                {"label":"F12", "x":15, "y":0},
-                {"label":"F13", "x":16, "y":0},
-                {"label":"PrtSc", "x":17.25, "y":0},
-                {"label":"Scroll Lock", "x":18.25, "y":0},
-                {"label":"Pause", "x":19.25, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2\"", "x":2, "y":1.5},
-                {"label":"3\u00a3", "x":3, "y":1.5},
-                {"label":"4$", "x":4, "y":1.5},
-                {"label":"5%", "x":5, "y":1.5},
-                {"label":"6^", "x":6, "y":1.5},
-                {"label":"7&", "x":9, "y":1.5},
-                {"label":"8*", "x":10, "y":1.5},
-                {"label":"9(", "x":11, "y":1.5},
-                {"label":"0)", "x":12, "y":1.5},
-                {"label":"-_", "x":13, "y":1.5},
-                {"label":"=+", "x":14, "y":1.5},
-                {"label":"\\|", "x":15, "y":1.5},
-                {"label":"Backspace", "x":16, "y":1.5},
-                {"label":"Insert", "x":17.25, "y":1.5},
-                {"label":"Home", "x":18.25, "y":1.5},
-                {"label":"Page Up", "x":19.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":8.5, "y":2.5},
-                {"label":"U", "x":9.5, "y":2.5},
-                {"label":"I", "x":10.5, "y":2.5},
-                {"label":"O", "x":11.5, "y":2.5},
-                {"label":"P", "x":12.5, "y":2.5},
-                {"label":"[{", "x":13.5, "y":2.5},
-                {"label":"]}", "x":14.5, "y":2.5},
-                {"label":"Delete", "x":17.25, "y":2.5},
-                {"label":"End", "x":18.25, "y":2.5},
-                {"label":"Page Down", "x":19.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":8.75, "y":3.5},
-                {"label":"J", "x":9.75, "y":3.5},
-                {"label":"K", "x":10.75, "y":3.5},
-                {"label":"L", "x":11.75, "y":3.5},
-                {"label":";:", "x":12.75, "y":3.5},
-                {"label":"'@", "x":13.75, "y":3.5},
-                {"label":"#~", "x":14.75, "y":3.5},
-                {"label":"Enter", "x":15.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.5},
-                {"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":"B", "x":8.25, "y":4.5},
-                {"label":"N", "x":9.25, "y":4.5},
-                {"label":"M", "x":10.25, "y":4.5},
-                {"label":",<", "x":11.25, "y":4.5},
-                {"label":".>", "x":12.25, "y":4.5},
-                {"label":"/?", "x":13.25, "y":4.5},
-                {"label":"Shift", "x":14.25, "y":4.5, "w":1.75},
-                {"label":"Fn", "x":16, "y":4.5},
-                {"label":"\u2191", "x":18.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.75, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":4.25, "y":5.5},
-                {"label":"Space", "x":5.25, "y":5.5, "w":2},
-                {"label":"Space", "x":8.25, "y":5.5, "w":3},
-                {"label":"ALT", "x":11.25, "y":5.5, "w":1.5},
-                {"label":"GUI", "x":12.75, "y":5.5},
-                {"label":"Ctrl", "x":15, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":17.25, "y":5.5},
-                {"label":"\u2193", "x":18.25, "y":5.5},
-                {"label":"\u2192", "x":19.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.25, "y": 0},
+                {"matrix": [0, 15], "x": 18.25, "y": 0},
+                {"matrix": [0, 16], "x": 19.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 9, "y": 1.5},
+                {"matrix": [1, 8], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [1, 10], "x": 12, "y": 1.5},
+                {"matrix": [1, 11], "x": 13, "y": 1.5},
+                {"matrix": [1, 12], "x": 14, "y": 1.5},
+                {"matrix": [1, 13], "x": 15, "y": 1.5},
+                {"matrix": [3, 14], "x": 16, "y": 1.5},
+
+                {"matrix": [1, 14], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 18.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 19.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 18.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 19.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+
+                {"matrix": [3, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 15.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 14], "x": 16, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 5.5, "w": 2},
+
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5, "w": 3},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 15, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 19.25, "y": 5.5}
             ]
         }
     }