Move remaining `LAYOUT`s to data driven (#20422)

1 files changed, 351 insertions, 318 deletions

diff --git a/keyboards/winkeyless/bminiex/info.json b/keyboards/winkeyless/bminiex/info.json
index 8b8da98045..03a8e408b5 100644
--- a/keyboards/winkeyless/bminiex/info.json
+++ b/keyboards/winkeyless/bminiex/info.json
@@ -30,332 +30,365 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PSCR", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"NO", "x":16.25, "y":0},
-        {"label":"NO", "x":17.25, "y":0},
-        {"label":"NO", "x":18.25, "y":0},
-        {"label":"NO", "x":19.25, "y":0},
-        {"label":"GRV", "x":0, "y":1.25},
-        {"label":"1", "x":1, "y":1.25},
-        {"label":"2", "x":2, "y":1.25},
-        {"label":"3", "x":3, "y":1.25},
-        {"label":"4", "x":4, "y":1.25},
-        {"label":"5", "x":5, "y":1.25},
-        {"label":"6", "x":6, "y":1.25},
-        {"label":"7", "x":7, "y":1.25},
-        {"label":"8", "x":8, "y":1.25},
-        {"label":"9", "x":9, "y":1.25},
-        {"label":"0", "x":10, "y":1.25},
-        {"label":"MINS", "x":11, "y":1.25},
-        {"label":"EQL", "x":12, "y":1.25},
-        {"label":"BSPC", "x":13, "y":1.25, "w":2},
-        {"label":"DEL", "x":15, "y":1.25},
-        {"label":"NLCK", "x":16.25, "y":1.25},
-        {"label":"PSLS", "x":17.25, "y":1.25},
-        {"label":"PAST", "x":18.25, "y":1.25},
-        {"label":"PMNS", "x":19.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":"LBRC", "x":11.5, "y":2.25},
-        {"label":"RBRC", "x":12.5, "y":2.25},
-        {"label":"NO", "x":13.5, "y":2.25, "w":1.5},
-        {"label":"INS", "x":15, "y":2.25},
-        {"label":"P7", "x":16.25, "y":2.25},
-        {"label":"P8", "x":17.25, "y":2.25},
-        {"label":"P9", "x":18.25, "y":2.25},
-        {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
-        {"label":"QUOT", "x":11.75, "y":3.25},
-        {"label":"NUHS", "x":12.75, "y":3.25},
-        {"label":"ENT", "x":13.75, "y":3.25, "w":1.25},
-        {"label":"PGUP", "x":15, "y":3.25},
-        {"label":"P4", "x":16.25, "y":3.25},
-        {"label":"P5", "x":17.25, "y":3.25},
-        {"label":"P6", "x":18.25, "y":3.25},
-        {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
-        {"label":"LSFT", "x":0, "y":4.25, "w":1.25},
-        {"label":"NUBS", "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":"COMM", "x":9.25, "y":4.25},
-        {"label":"DOT", "x":10.25, "y":4.25},
-        {"label":"SLSH", "x":11.25, "y":4.25},
-        {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
-        {"label":"UP", "x":14, "y":4.25},
-        {"label":"PGDN", "x":15, "y":4.25},
-        {"label":"P1", "x":16.25, "y":4.25},
-        {"label":"P2", "x":17.25, "y":4.25},
-        {"label":"P3", "x":18.25, "y":4.25},
-        {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
-        {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
-        {"label":"RALT", "x":10, "y":5.25},
-        {"label":"APP", "x":11, "y":5.25},
-        {"label":"RCTL", "x":12, "y":5.25},
-        {"label":"LEFT", "x":13, "y":5.25},
-        {"label":"DOWN", "x":14, "y":5.25},
-        {"label":"RGHT", "x":15, "y":5.25},
-        {"label":"P0", "x":16.25, "y":5.25, "w":2},
-        {"label":"PDOT", "x":18.25, "y":5.25},
-        {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 2], "x": 1, "y": 0},
+        {"matrix": [5, 3], "x": 2, "y": 0},
+        {"matrix": [5, 4], "x": 3, "y": 0},
+        {"matrix": [5, 5], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 10], "x": 6, "y": 0},
+        {"matrix": [7, 10], "x": 7, "y": 0},
+        {"matrix": [7, 0], "x": 8, "y": 0},
+        {"matrix": [5, 11], "x": 9, "y": 0},
+        {"matrix": [5, 12], "x": 10, "y": 0},
+        {"matrix": [5, 13], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [1, 13], "x": 13, "y": 0},
+        {"matrix": [1, 14], "x": 14, "y": 0},
+        {"matrix": [2, 14], "x": 15, "y": 0},
+
+        {"matrix": [5, 6], "x": 16.25, "y": 0},
+        {"matrix": [5, 7], "x": 17.25, "y": 0},
+        {"matrix": [5, 8], "x": 18.25, "y": 0},
+        {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1.25},
+        {"matrix": [4, 1], "x": 1, "y": 1.25},
+        {"matrix": [4, 2], "x": 2, "y": 1.25},
+        {"matrix": [4, 3], "x": 3, "y": 1.25},
+        {"matrix": [4, 4], "x": 4, "y": 1.25},
+        {"matrix": [4, 5], "x": 5, "y": 1.25},
+        {"matrix": [6, 1], "x": 6, "y": 1.25},
+        {"matrix": [6, 11], "x": 7, "y": 1.25},
+        {"matrix": [7, 11], "x": 8, "y": 1.25},
+        {"matrix": [7, 1], "x": 9, "y": 1.25},
+        {"matrix": [4, 10], "x": 10, "y": 1.25},
+        {"matrix": [4, 11], "x": 11, "y": 1.25},
+        {"matrix": [4, 12], "x": 12, "y": 1.25},
+        {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+        {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+        {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+        {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+        {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+        {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+        {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+        {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+        {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+        {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+        {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+        {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+        {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+        {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+        {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+        {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+        {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+        {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [2, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+        {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+        {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+        {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+        {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+        {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [0, 3], "x": 1.25, "y": 4.25},
+        {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+        {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+        {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+        {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+        {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [6, 8], "x": 14, "y": 4.25},
+        {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+        {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+        {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+        {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+        {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [7, 5], "x": 10, "y": 5.25},
+        {"matrix": [0, 11], "x": 11, "y": 5.25},
+        {"matrix": [0, 12], "x": 12, "y": 5.25},
+        {"matrix": [6, 6], "x": 13, "y": 5.25},
+        {"matrix": [6, 7], "x": 14, "y": 5.25},
+        {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+        {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+        {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+        {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
       ]
     },
     "LAYOUT_ansi": {
       "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PSCR", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"NO", "x":16.25, "y":0},
-        {"label":"NO", "x":17.25, "y":0},
-        {"label":"NO", "x":18.25, "y":0},
-        {"label":"NO", "x":19.25, "y":0},
-        {"label":"GRV", "x":0, "y":1.25},
-        {"label":"1", "x":1, "y":1.25},
-        {"label":"2", "x":2, "y":1.25},
-        {"label":"3", "x":3, "y":1.25},
-        {"label":"4", "x":4, "y":1.25},
-        {"label":"5", "x":5, "y":1.25},
-        {"label":"6", "x":6, "y":1.25},
-        {"label":"7", "x":7, "y":1.25},
-        {"label":"8", "x":8, "y":1.25},
-        {"label":"9", "x":9, "y":1.25},
-        {"label":"0", "x":10, "y":1.25},
-        {"label":"MINS", "x":11, "y":1.25},
-        {"label":"EQL", "x":12, "y":1.25},
-        {"label":"BSPC", "x":13, "y":1.25, "w":2},
-        {"label":"DEL", "x":15, "y":1.25},
-        {"label":"NLCK", "x":16.25, "y":1.25},
-        {"label":"PSLS", "x":17.25, "y":1.25},
-        {"label":"PAST", "x":18.25, "y":1.25},
-        {"label":"PMNS", "x":19.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":"LBRC", "x":11.5, "y":2.25},
-        {"label":"RBRC", "x":12.5, "y":2.25},
-        {"label":"BSLS", "x":13.5, "y":2.25, "w":1.5},
-        {"label":"INS", "x":15, "y":2.25},
-        {"label":"P7", "x":16.25, "y":2.25},
-        {"label":"P8", "x":17.25, "y":2.25},
-        {"label":"P9", "x":18.25, "y":2.25},
-        {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
-        {"label":"QUOT", "x":11.75, "y":3.25},
-        {"label":"ENT", "x":12.75, "y":3.25, "w":2.25},
-        {"label":"PGUP", "x":15, "y":3.25},
-        {"label":"P4", "x":16.25, "y":3.25},
-        {"label":"P5", "x":17.25, "y":3.25},
-        {"label":"P6", "x":18.25, "y":3.25},
-        {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
-        {"label":"LSFT", "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":"COMM", "x":9.25, "y":4.25},
-        {"label":"DOT", "x":10.25, "y":4.25},
-        {"label":"SLSH", "x":11.25, "y":4.25},
-        {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
-        {"label":"UP", "x":14, "y":4.25},
-        {"label":"PGDN", "x":15, "y":4.25},
-        {"label":"P1", "x":16.25, "y":4.25},
-        {"label":"P2", "x":17.25, "y":4.25},
-        {"label":"P3", "x":18.25, "y":4.25},
-        {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
-        {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
-        {"label":"RALT", "x":10, "y":5.25},
-        {"label":"APP", "x":11, "y":5.25},
-        {"label":"RCTL", "x":12, "y":5.25},
-        {"label":"LEFT", "x":13, "y":5.25},
-        {"label":"DOWN", "x":14, "y":5.25},
-        {"label":"RGHT", "x":15, "y":5.25},
-        {"label":"P0", "x":16.25, "y":5.25, "w":2},
-        {"label":"PDOT", "x":18.25, "y":5.25},
-        {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 2], "x": 1, "y": 0},
+        {"matrix": [5, 3], "x": 2, "y": 0},
+        {"matrix": [5, 4], "x": 3, "y": 0},
+        {"matrix": [5, 5], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 10], "x": 6, "y": 0},
+        {"matrix": [7, 10], "x": 7, "y": 0},
+        {"matrix": [7, 0], "x": 8, "y": 0},
+        {"matrix": [5, 11], "x": 9, "y": 0},
+        {"matrix": [5, 12], "x": 10, "y": 0},
+        {"matrix": [5, 13], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [1, 13], "x": 13, "y": 0},
+        {"matrix": [1, 14], "x": 14, "y": 0},
+        {"matrix": [2, 14], "x": 15, "y": 0},
+
+        {"matrix": [5, 6], "x": 16.25, "y": 0},
+        {"matrix": [5, 7], "x": 17.25, "y": 0},
+        {"matrix": [5, 8], "x": 18.25, "y": 0},
+        {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1.25},
+        {"matrix": [4, 1], "x": 1, "y": 1.25},
+        {"matrix": [4, 2], "x": 2, "y": 1.25},
+        {"matrix": [4, 3], "x": 3, "y": 1.25},
+        {"matrix": [4, 4], "x": 4, "y": 1.25},
+        {"matrix": [4, 5], "x": 5, "y": 1.25},
+        {"matrix": [6, 1], "x": 6, "y": 1.25},
+        {"matrix": [6, 11], "x": 7, "y": 1.25},
+        {"matrix": [7, 11], "x": 8, "y": 1.25},
+        {"matrix": [7, 1], "x": 9, "y": 1.25},
+        {"matrix": [4, 10], "x": 10, "y": 1.25},
+        {"matrix": [4, 11], "x": 11, "y": 1.25},
+        {"matrix": [4, 12], "x": 12, "y": 1.25},
+        {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+        {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+        {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+        {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+        {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+        {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+        {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+        {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+        {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+        {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [3, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+        {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+        {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+        {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+        {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+        {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+        {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+        {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+        {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+        {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+        {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+        {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+        {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+        {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 2.25},
+        {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+        {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+        {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+        {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+        {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [6, 8], "x": 14, "y": 4.25},
+        {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+        {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+        {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+        {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+        {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [7, 5], "x": 10, "y": 5.25},
+        {"matrix": [0, 11], "x": 11, "y": 5.25},
+        {"matrix": [0, 12], "x": 12, "y": 5.25},
+        {"matrix": [6, 6], "x": 13, "y": 5.25},
+        {"matrix": [6, 7], "x": 14, "y": 5.25},
+        {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+        {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+        {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+        {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
       ]
     },
     "LAYOUT_iso": {
       "layout": [
-        {"label":"ESC", "x":0, "y":0},
-        {"label":"F1", "x":1, "y":0},
-        {"label":"F2", "x":2, "y":0},
-        {"label":"F3", "x":3, "y":0},
-        {"label":"F4", "x":4, "y":0},
-        {"label":"F5", "x":5, "y":0},
-        {"label":"F6", "x":6, "y":0},
-        {"label":"F7", "x":7, "y":0},
-        {"label":"F8", "x":8, "y":0},
-        {"label":"F9", "x":9, "y":0},
-        {"label":"F10", "x":10, "y":0},
-        {"label":"F11", "x":11, "y":0},
-        {"label":"F12", "x":12, "y":0},
-        {"label":"PSCR", "x":13, "y":0},
-        {"label":"HOME", "x":14, "y":0},
-        {"label":"END", "x":15, "y":0},
-        {"label":"NO", "x":16.25, "y":0},
-        {"label":"NO", "x":17.25, "y":0},
-        {"label":"NO", "x":18.25, "y":0},
-        {"label":"NO", "x":19.25, "y":0},
-        {"label":"GRV", "x":0, "y":1.25},
-        {"label":"1", "x":1, "y":1.25},
-        {"label":"2", "x":2, "y":1.25},
-        {"label":"3", "x":3, "y":1.25},
-        {"label":"4", "x":4, "y":1.25},
-        {"label":"5", "x":5, "y":1.25},
-        {"label":"6", "x":6, "y":1.25},
-        {"label":"7", "x":7, "y":1.25},
-        {"label":"8", "x":8, "y":1.25},
-        {"label":"9", "x":9, "y":1.25},
-        {"label":"0", "x":10, "y":1.25},
-        {"label":"MINS", "x":11, "y":1.25},
-        {"label":"EQL", "x":12, "y":1.25},
-        {"label":"BSPC", "x":13, "y":1.25, "w":2},
-        {"label":"DEL", "x":15, "y":1.25},
-        {"label":"NLCK", "x":16.25, "y":1.25},
-        {"label":"PSLS", "x":17.25, "y":1.25},
-        {"label":"PAST", "x":18.25, "y":1.25},
-        {"label":"PMNS", "x":19.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":"LBRC", "x":11.5, "y":2.25},
-        {"label":"RBRC", "x":12.5, "y":2.25},
-        {"label":"INS", "x":15, "y":2.25},
-        {"label":"P7", "x":16.25, "y":2.25},
-        {"label":"P8", "x":17.25, "y":2.25},
-        {"label":"P9", "x":18.25, "y":2.25},
-        {"label":"CAPS", "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":"SCLN", "x":10.75, "y":3.25},
-        {"label":"QUOT", "x":11.75, "y":3.25},
-        {"label":"NUHS", "x":12.75, "y":3.25},
-        {"label":"ENT", "x":13.75, "y":2.25, "w":1.25, "h":2},
-        {"label":"PGUP", "x":15, "y":3.25},
-        {"label":"P4", "x":16.25, "y":3.25},
-        {"label":"P5", "x":17.25, "y":3.25},
-        {"label":"P6", "x":18.25, "y":3.25},
-        {"label":"PPLS", "x":19.25, "y":2.25, "h":2},
-        {"label":"LSFT", "x":0, "y":4.25, "w":1.25},
-        {"label":"NUBS", "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":"COMM", "x":9.25, "y":4.25},
-        {"label":"DOT", "x":10.25, "y":4.25},
-        {"label":"SLSH", "x":11.25, "y":4.25},
-        {"label":"RSFT", "x":12.25, "y":4.25, "w":1.75},
-        {"label":"UP", "x":14, "y":4.25},
-        {"label":"PGDN", "x":15, "y":4.25},
-        {"label":"P1", "x":16.25, "y":4.25},
-        {"label":"P2", "x":17.25, "y":4.25},
-        {"label":"P3", "x":18.25, "y":4.25},
-        {"label":"LCTL", "x":0, "y":5.25, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5.25, "w":1.25},
-        {"label":"LALT", "x":2.5, "y":5.25, "w":1.25},
-        {"label":"SPC", "x":3.75, "y":5.25, "w":6.25},
-        {"label":"RALT", "x":10, "y":5.25},
-        {"label":"APP", "x":11, "y":5.25},
-        {"label":"RCTL", "x":12, "y":5.25},
-        {"label":"LEFT", "x":13, "y":5.25},
-        {"label":"DOWN", "x":14, "y":5.25},
-        {"label":"RGHT", "x":15, "y":5.25},
-        {"label":"P0", "x":16.25, "y":5.25, "w":2},
-        {"label":"PDOT", "x":18.25, "y":5.25},
-        {"label":"PENT", "x":19.25, "y":4.25, "h":2}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 2], "x": 1, "y": 0},
+        {"matrix": [5, 3], "x": 2, "y": 0},
+        {"matrix": [5, 4], "x": 3, "y": 0},
+        {"matrix": [5, 5], "x": 4, "y": 0},
+        {"matrix": [6, 0], "x": 5, "y": 0},
+        {"matrix": [6, 10], "x": 6, "y": 0},
+        {"matrix": [7, 10], "x": 7, "y": 0},
+        {"matrix": [7, 0], "x": 8, "y": 0},
+        {"matrix": [5, 11], "x": 9, "y": 0},
+        {"matrix": [5, 12], "x": 10, "y": 0},
+        {"matrix": [5, 13], "x": 11, "y": 0},
+        {"matrix": [5, 14], "x": 12, "y": 0},
+        {"matrix": [1, 13], "x": 13, "y": 0},
+        {"matrix": [1, 14], "x": 14, "y": 0},
+        {"matrix": [2, 14], "x": 15, "y": 0},
+
+        {"matrix": [5, 6], "x": 16.25, "y": 0},
+        {"matrix": [5, 7], "x": 17.25, "y": 0},
+        {"matrix": [5, 8], "x": 18.25, "y": 0},
+        {"matrix": [5, 9], "x": 19.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1.25},
+        {"matrix": [4, 1], "x": 1, "y": 1.25},
+        {"matrix": [4, 2], "x": 2, "y": 1.25},
+        {"matrix": [4, 3], "x": 3, "y": 1.25},
+        {"matrix": [4, 4], "x": 4, "y": 1.25},
+        {"matrix": [4, 5], "x": 5, "y": 1.25},
+        {"matrix": [6, 1], "x": 6, "y": 1.25},
+        {"matrix": [6, 11], "x": 7, "y": 1.25},
+        {"matrix": [7, 11], "x": 8, "y": 1.25},
+        {"matrix": [7, 1], "x": 9, "y": 1.25},
+        {"matrix": [4, 10], "x": 10, "y": 1.25},
+        {"matrix": [4, 11], "x": 11, "y": 1.25},
+        {"matrix": [4, 12], "x": 12, "y": 1.25},
+        {"matrix": [4, 14], "x": 13, "y": 1.25, "w": 2},
+        {"matrix": [0, 13], "x": 15, "y": 1.25},
+
+        {"matrix": [4, 6], "x": 16.25, "y": 1.25},
+        {"matrix": [4, 7], "x": 17.25, "y": 1.25},
+        {"matrix": [4, 8], "x": 18.25, "y": 1.25},
+        {"matrix": [4, 9], "x": 19.25, "y": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [3, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [3, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+        {"matrix": [6, 12], "x": 7.5, "y": 2.25},
+        {"matrix": [7, 12], "x": 8.5, "y": 2.25},
+        {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+        {"matrix": [3, 10], "x": 10.5, "y": 2.25},
+        {"matrix": [3, 11], "x": 11.5, "y": 2.25},
+        {"matrix": [3, 12], "x": 12.5, "y": 2.25},
+        {"matrix": [7, 6], "x": 15, "y": 2.25},
+
+        {"matrix": [3, 6], "x": 16.25, "y": 2.25},
+        {"matrix": [3, 7], "x": 17.25, "y": 2.25},
+        {"matrix": [3, 8], "x": 18.25, "y": 2.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [2, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [2, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [2, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+        {"matrix": [6, 13], "x": 7.75, "y": 3.25},
+        {"matrix": [7, 13], "x": 8.75, "y": 3.25},
+        {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+        {"matrix": [2, 10], "x": 10.75, "y": 3.25},
+        {"matrix": [2, 11], "x": 11.75, "y": 3.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 3.25},
+        {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+        {"matrix": [0, 14], "x": 15, "y": 3.25},
+
+        {"matrix": [2, 6], "x": 16.25, "y": 3.25},
+        {"matrix": [2, 7], "x": 17.25, "y": 3.25},
+        {"matrix": [2, 8], "x": 18.25, "y": 3.25},
+        {"matrix": [2, 9], "x": 19.25, "y": 2.25, "h": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [0, 3], "x": 1.25, "y": 4.25},
+        {"matrix": [1, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [1, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [1, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [1, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [1, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+        {"matrix": [6, 14], "x": 8.25, "y": 4.25},
+        {"matrix": [7, 14], "x": 9.25, "y": 4.25},
+        {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+        {"matrix": [1, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [1, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [6, 8], "x": 14, "y": 4.25},
+        {"matrix": [7, 7], "x": 15, "y": 4.25},
+
+        {"matrix": [1, 6], "x": 16.25, "y": 4.25},
+        {"matrix": [1, 7], "x": 17.25, "y": 4.25},
+        {"matrix": [1, 8], "x": 18.25, "y": 4.25},
+
+        {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [7, 5], "x": 10, "y": 5.25},
+        {"matrix": [0, 11], "x": 11, "y": 5.25},
+        {"matrix": [0, 12], "x": 12, "y": 5.25},
+        {"matrix": [6, 6], "x": 13, "y": 5.25},
+        {"matrix": [6, 7], "x": 14, "y": 5.25},
+        {"matrix": [6, 9], "x": 15, "y": 5.25},
+
+        {"matrix": [0, 6], "x": 16.25, "y": 5.25, "w": 2},
+        {"matrix": [0, 8], "x": 18.25, "y": 5.25},
+        {"matrix": [0, 9], "x": 19.25, "y": 4.25, "h": 2}
       ]
     }
   }