Merge branch 'develop'

1 files changed, 445 insertions, 437 deletions

diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json
index e9ab25aedb..add2f077fe 100644
--- a/keyboards/chlx/str_merro60/info.json
+++ b/keyboards/chlx/str_merro60/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0602",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "D3"
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "E6", "B0", "B1", "B2"],
+        "rows": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B7"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
@@ -19,495 +27,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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "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": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "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": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "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": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "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": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "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": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "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": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "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": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [9, 6], "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": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "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": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "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": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x": 0,      "y": 4, "w": 1.5},
-                {"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},
-                {"x": 13.5,   "y": 4, "w": 1.5}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 4, "y": 4, "w": 7},
+                {"matrix": [8, 5], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [9, 5], "x": 12.5, "y": 4},
+                {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.5}
             ]
         }
     }