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

3 files changed, 478 insertions, 2254 deletions

diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/info.json
index 34fae50a89..0b6c9f6f67 100644
--- a/keyboards/handwired/dygma/raise/ansi/info.json
+++ b/keyboards/handwired/dygma/raise/ansi/info.json
@@ -2,1110 +2,253 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "enter",
-                    "h": 2,
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "#",
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "\\",
-                    "w": 1.5,
-                    "x": 15.25,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "enter",
-                    "w": 2.25,
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 2.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2, "w": 2.25},
+
+                {"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": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "enter",
-                    "h": 2,
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "#",
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/info.json
index 34fae50a89..0b6c9f6f67 100644
--- a/keyboards/handwired/dygma/raise/iso/info.json
+++ b/keyboards/handwired/dygma/raise/iso/info.json
@@ -2,1110 +2,253 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "enter",
-                    "h": 2,
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "#",
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "\\",
-                    "w": 1.5,
-                    "x": 15.25,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "enter",
-                    "w": 2.25,
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 2.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.25, "y": 1, "w": 1.5},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2, "w": 2.25},
+
+                {"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": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "label": "esc",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "1",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "6",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "-",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13.75,
-                    "y": 0
-                },
-                {
-                    "label": "backspace",
-                    "w": 2,
-                    "x": 14.75,
-                    "y": 0
-                },
-                {
-                    "label": "tab",
-                    "w": 1.5,
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "label": "[",
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "label": "]",
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "label": "enter",
-                    "h": 2,
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 1
-                },
-                {
-                    "label": "caps",
-                    "w": 1.75,
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 10.5,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 11.5,
-                    "y": 2
-                },
-                {
-                    "label": ";",
-                    "x": 12.5,
-                    "y": 2
-                },
-                {
-                    "label": "'",
-                    "x": 13.5,
-                    "y": 2
-                },
-                {
-                    "label": "#",
-                    "x": 14.5,
-                    "y": 2
-                },
-                {
-                    "label": "shift",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "\\",
-                    "x": 1.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "label": ",",
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "label": ".",
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "label": "/",
-                    "x": 13,
-                    "y": 3
-                },
-                {
-                    "label": "shift",
-                    "w": 2.75,
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 1.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 2.5,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 4
-                },
-                {
-                    "label": "\u2014",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 4
-                },
-                {
-                    "label": "...",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 4
-                },
-                {
-                    "label": "alt",
-                    "w": 1.25,
-                    "x": 11.75,
-                    "y": 4
-                },
-                {
-                    "label": "fn",
-                    "w": 1.25,
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "os",
-                    "w": 1.25,
-                    "x": 14.25,
-                    "y": 4
-                },
-                {
-                    "label": "ctrl",
-                    "w": 1.25,
-                    "x": 15.5,
-                    "y": 4
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 3.75,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 5.25,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "w": 1.5,
-                    "x": 8.75,
-                    "y": 5
-                },
-                {
-                    "label": "..",
-                    "w": 1.5,
-                    "x": 10.25,
-                    "y": 5
-                }
+                {"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": [5, 6], "x": 8.75, "y": 0},
+                {"matrix": [5, 5], "x": 9.75, "y": 0},
+                {"matrix": [5, 4], "x": 10.75, "y": 0},
+                {"matrix": [5, 3], "x": 11.75, "y": 0},
+                {"matrix": [5, 2], "x": 12.75, "y": 0},
+                {"matrix": [5, 1], "x": 13.75, "y": 0},
+                {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2},
+
+                {"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": [6, 7], "x": 8.25, "y": 1},
+                {"matrix": [6, 6], "x": 9.25, "y": 1},
+                {"matrix": [6, 5], "x": 10.25, "y": 1},
+                {"matrix": [6, 4], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 2], "x": 13.25, "y": 1},
+                {"matrix": [6, 1], "x": 14.25, "y": 1},
+                {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
+
+                {"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": [7, 6], "x": 8.5, "y": 2},
+                {"matrix": [7, 5], "x": 9.5, "y": 2},
+                {"matrix": [7, 4], "x": 10.5, "y": 2},
+                {"matrix": [7, 3], "x": 11.5, "y": 2},
+                {"matrix": [7, 2], "x": 12.5, "y": 2},
+                {"matrix": [7, 1], "x": 13.5, "y": 2},
+                {"matrix": [7, 0], "x": 14.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+                {"matrix": [8, 5], "x": 9, "y": 3},
+                {"matrix": [8, 4], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 2], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5},
+
+                {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5},
+                {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/dygma/raise/raise.h b/keyboards/handwired/dygma/raise/raise.h
index 6310fc3d08..8515688790 100644
--- a/keyboards/handwired/dygma/raise/raise.h
+++ b/keyboards/handwired/dygma/raise/raise.h
@@ -19,65 +19,3 @@
 #include "quantum.h"
 
 #include "leds.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
-                      L46, L47,                      R47, R46                      \
-) { \
-		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
-		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-		{ L30, L31, L32, L33, L34, L35, L36, XXX }, \
-		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
-		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
-		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
-		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
-		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
-		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
-}
-
-#define LAYOUT_ansi( \
-  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
-  L31     , L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
-                      L46, L47,                      R47, R46                      \
-) { \
-		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
-		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-		{ XXX, L31, L32, L33, L34, L35, L36, XXX }, \
-		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
-		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
-		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
-		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
-		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
-		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
-}
-
-#define LAYOUT_iso( \
-  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
-  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
-  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
-  L30, L31, L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
-  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
-                      L46, L47,                      R47, R46                      \
-) { \
-		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
-		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
-		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
-		{ L30, L31, L32, L33, L34, L35, L36, XXX }, \
-		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
-		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
-		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
-		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
-		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
-		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
-}