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

1 files changed, 314 insertions, 272 deletions

diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 568b363360..f91419f58d 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -24,286 +24,328 @@
     "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": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Bksp", "x": 13, "y": 1.25 },
-                { "label": "~", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [2, 1], "x": 1, "y": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 2], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [2, 3], "x": 5, "y": 1.25},
+                {"matrix": [3, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 4], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [2, 5], "x": 9, "y": 1.25},
+                {"matrix": [3, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 6], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25},
+                {"matrix": [5, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_ansi": {
             "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": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Bksp", "x": 13, "y": 1.25 },
-                { "label": "~", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [2, 1], "x": 1, "y": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 2], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [2, 3], "x": 5, "y": 1.25},
+                {"matrix": [3, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 4], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [2, 5], "x": 9, "y": 1.25},
+                {"matrix": [3, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 6], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25},
+                {"matrix": [5, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [6, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_iso": {
             "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": 6.5, "y": 0 },
-                { "label": "F7", "x": 7.5, "y": 0 },
-                { "label": "F8", "x": 8.5, "y": 0 },
-                { "label": "F9", "x": 9.75, "y": 0 },
-                { "label": "F10", "x": 10.75, "y": 0 },
-                { "label": "F11", "x": 11.75, "y": 0 },
-                { "label": "F12", "x": 12.75, "y": 0 },
-                { "label": "F13", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "label": "Bksp", "x": 13, "y": 1.25 },
-                { "label": "~", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h":2 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "label": "|", "x": 12.75, "y": 3.25 },
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [0, 6], "x": 11.75, "y": 0},
+                {"matrix": [1, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 7], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [2, 1], "x": 1, "y": 1.25},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 2], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [2, 3], "x": 5, "y": 1.25},
+                {"matrix": [3, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 4], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [2, 5], "x": 9, "y": 1.25},
+                {"matrix": [3, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 6], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25},
+                {"matrix": [6, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 11.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 7], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [8, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }