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

2 files changed, 437 insertions, 651 deletions

diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json
index 99308fecde..f9de8194ba 100644
--- a/keyboards/chlx/merro60/info.json
+++ b/keyboards/chlx/merro60/info.json
@@ -25,495 +25,495 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "y": 2, "w": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"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": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x":0,       "y":0},
-                {"x":1,       "y":0},
-                {"x":2,       "y":0},
-                {"x":3,       "y":0},
-                {"x":4,       "y":0},
-                {"x":5,       "y":0},
-                {"x":6,       "y":0},
-                {"x":7,       "y":0},
-                {"x":8,       "y":0},
-                {"x":9,       "y":0},
-                {"x":10,      "y":0},
-                {"x":11,      "y":0},
-                {"x":12,      "y":0},
-                {"x":13,      "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"x":0,       "y":1, "w":1.5},
-                {"x":1.5,     "y":1},
-                {"x":2.5,     "y":1},
-                {"x":3.5,     "y":1},
-                {"x":4.5,     "y":1},
-                {"x":5.5,     "y":1},
-                {"x":6.5,     "y":1},
-                {"x":7.5,     "y":1},
-                {"x":8.5,     "y":1},
-                {"x":9.5,     "y":1},
-                {"x":10.5,    "y":1},
-                {"x":11.5,    "y":1},
-                {"x":12.5,    "y":1},
-                {"x":13.5,    "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x":0,       "y":2, "w":1.75},
-                {"x":1.75,    "y":2},
-                {"x":2.75,    "y":2},
-                {"x":3.75,    "y":2},
-                {"x":4.75,    "y":2},
-                {"x":5.75,    "y":2},
-                {"x":6.75,    "y":2},
-                {"x":7.75,    "y":2},
-                {"x":8.75,    "y":2},
-                {"x":9.75,    "y":2},
-                {"x":10.75,   "y":2},
-                {"x":11.75,   "y":2},
-                {"x":12.75,   "y":2, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0,       "y":3, "w":2.25},
-                {"x":2.25,    "y":3},
-                {"x":3.25,    "y":3},
-                {"x":4.25,    "y":3},
-                {"x":5.25,    "y":3},
-                {"x":6.25,    "y":3},
-                {"x":7.25,    "y":3},
-                {"x":8.25,    "y":3},
-                {"x":9.25,    "y":3},
-                {"x":10.25,   "y":3},
-                {"x":11.25,   "y":3},
-                {"x":12.25,   "y":3, "w":2.75},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x":0,       "y":4, "w":1.25},
-                {"x":1.25,    "y":4, "w":1.25},
-                {"x":2.5,     "y":4, "w":1.25},
-                {"x":3.75,    "y":4, "w":6.25},
-                {"x":10,      "y":4, "w":1.25},
-                {"x":11.25,   "y":4, "w":1.25},
-                {"x":12.5,    "y":4, "w":1.25},
-                {"x":13.75,   "y":4, "w":1.25}
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_hhkb": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
-                {"x": 13.5,   "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2, "w": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x": 0,      "y": 3, "w": 2.25},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 1.5,    "y": 4},
-                {"x": 2.5,    "y": 4, "w": 1.5},
-                {"x": 4,      "y": 4, "w": 7},
-                {"x": 11,     "y": 4, "w": 1.5},
-                {"x": 12.5,   "y": 4}
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0, "w": 2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 2.75},
+                {"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": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1},
-                {"x": 8.5,    "y": 1},
-                {"x": 9.5,    "y": 1},
-                {"x": 10.5,   "y": 1},
-                {"x": 11.5,   "y": 1},
-                {"x": 12.5,   "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"x": 0,      "y": 2, "w": 1.75},
-                {"x": 1.75,   "y": 2},
-                {"x": 2.75,   "y": 2},
-                {"x": 3.75,   "y": 2},
-                {"x": 4.75,   "y": 2},
-                {"x": 5.75,   "y": 2},
-                {"x": 6.75,   "y": 2},
-                {"x": 7.75,   "y": 2},
-                {"x": 8.75,   "y": 2},
-                {"x": 9.75,   "y": 2},
-                {"x": 10.75,  "y": 2},
-                {"x": 11.75,  "y": 2},
-                {"x": 12.75,  "y": 2},
-                {"x": 13.75,  "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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x": 0,      "y": 3, "w": 1.25},
-                {"x": 1.25,   "y": 3},
-                {"x": 2.25,   "y": 3},
-                {"x": 3.25,   "y": 3},
-                {"x": 4.25,   "y": 3},
-                {"x": 5.25,   "y": 3},
-                {"x": 6.25,   "y": 3},
-                {"x": 7.25,   "y": 3},
-                {"x": 8.25,   "y": 3},
-                {"x": 9.25,   "y": 3},
-                {"x": 10.25,  "y": 3},
-                {"x": 11.25,  "y": 3},
-                {"x": 12.25,  "y": 3, "w": 1.75},
-                {"x": 14,     "y": 3},
+                {"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": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.25},
-                {"x": 1.25,   "y": 4, "w": 1.25},
-                {"x": 2.5,    "y": 4, "w": 1.25},
-                {"x": 3.75,   "y": 4, "w": 6.25},
-                {"x": 10,     "y": 4, "w": 1.25},
-                {"x": 11.25,  "y": 4, "w": 1.25},
-                {"x": 12.5,   "y": 4, "w": 1.25},
-                {"x": 13.75,  "y": 4, "w": 1.25}
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x": 0,      "y": 0},
-                {"x": 1,      "y": 0},
-                {"x": 2,      "y": 0},
-                {"x": 3,      "y": 0},
-                {"x": 4,      "y": 0},
-                {"x": 5,      "y": 0},
-                {"x": 6,      "y": 0},
-                {"x": 7,      "y": 0},
-                {"x": 8,      "y": 0},
-                {"x": 9,      "y": 0},
-                {"x": 10,     "y": 0},
-                {"x": 11,     "y": 0},
-                {"x": 12,     "y": 0},
-                {"x": 13,     "y": 0},
-                {"x": 14,     "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
 
-                {"x": 0,      "y": 1, "w": 1.5},
-                {"x": 1.5,    "y": 1},
-                {"x": 2.5,    "y": 1},
-                {"x": 3.5,    "y": 1},
-                {"x": 4.5,    "y": 1},
-                {"x": 5.5,    "y": 1},
-                {"x": 6.5,    "y": 1},
-                {"x": 7.5,    "y": 1