Geistmaschine Geist Layout Refactor and Touch-Up (#21288)

1 files changed, 222 insertions, 218 deletions

diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
index 77a9a937e5..571740b716 100644
--- a/keyboards/geistmaschine/geist/info.json
+++ b/keyboards/geistmaschine/geist/info.json
@@ -29,242 +29,246 @@
             {"pin_a": "B0", "pin_b": "B7", "resolution": 2}
         ]
     },
-    "community_layouts": ["65_ansi", "65_iso"],
+    "layout_aliases": {
+        "LAYOUT_65_all": "LAYOUT_all",
+        "LAYOUT_65_ansi": "LAYOUT_ansi_blocker",
+        "LAYOUT_65_iso": "LAYOUT_iso_blocker"
+    },
     "layouts": {
-        "LAYOUT_65_all": {
+        "LAYOUT_all": {
             "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "matrix": [1, 6]},
-              {"x": 15.25, "y": 0, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [1, 6], "x": 14.25, "y": 0},
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "matrix": [4, 6]},
-              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
-              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [4, 6], "x": 18, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [4, 7], "x": 19, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
-              {"x": 2.5, "y": 3, "matrix": [7, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 3},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 2.25, "matrix": [8, 2]},
-              {"x": 7.25, "y": 4, "w": 1.25, "matrix": [8, 3]},
-              {"x": 8.5, "y": 4, "w": 2.75, "matrix": [8, 4]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 5, "y": 4, "w": 2.25},
+                {"matrix": [8, 3], "x": 7.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 8.5, "y": 4, "w": 2.75},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
             ]
         },
-        "LAYOUT_65_ansi": {
+        "LAYOUT_ansi_blocker": {
             "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 2.25, "matrix": [6, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
-          ]
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
+            ]
         },
-        "LAYOUT_65_iso": {
-          "layout": [
-              {"x": 0, "y": 0, "matrix": [9, 1]},
-              {"x": 1.25, "y": 0, "matrix": [0, 0]},
-              {"x": 2.25, "y": 0, "matrix": [1, 0]},
-              {"x": 3.25, "y": 0, "matrix": [0, 1]},
-              {"x": 4.25, "y": 0, "matrix": [1, 1]},
-              {"x": 5.25, "y": 0, "matrix": [0, 2]},
-              {"x": 6.25, "y": 0, "matrix": [1, 2]},
-              {"x": 7.25, "y": 0, "matrix": [0, 3]},
-              {"x": 8.25, "y": 0, "matrix": [1, 3]},
-              {"x": 9.25, "y": 0, "matrix": [0, 4]},
-              {"x": 10.25, "y": 0, "matrix": [1, 4]},
-              {"x": 11.25, "y": 0, "matrix": [0, 5]},
-              {"x": 12.25, "y": 0, "matrix": [1, 5]},
-              {"x": 13.25, "y": 0, "matrix": [0, 6]},
-              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
-              {"x": 16.25, "y": 0, "matrix": [1, 7]},
+        "LAYOUT_iso_blocker": {
+            "layout": [
+                {"matrix": [9, 1], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 0], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 1], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.25, "y": 0},
+                {"matrix": [1, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 3], "x": 7.25, "y": 0},
+                {"matrix": [1, 3], "x": 8.25, "y": 0},
+                {"matrix": [0, 4], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [0, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
 
-              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
-              {"x": 2.75, "y": 1, "matrix": [3, 0]},
-              {"x": 3.75, "y": 1, "matrix": [2, 1]},
-              {"x": 4.75, "y": 1, "matrix": [3, 1]},
-              {"x": 5.75, "y": 1, "matrix": [2, 2]},
-              {"x": 6.75, "y": 1, "matrix": [3, 2]},
-              {"x": 7.75, "y": 1, "matrix": [2, 3]},
-              {"x": 8.75, "y": 1, "matrix": [3, 3]},
-              {"x": 9.75, "y": 1, "matrix": [2, 4]},
-              {"x": 10.75, "y": 1, "matrix": [3, 4]},
-              {"x": 11.75, "y": 1, "matrix": [2, 5]},
-              {"x": 12.75, "y": 1, "matrix": [3, 5]},
-              {"x": 13.75, "y": 1, "matrix": [2, 6]},
-              {"x": 16.25, "y": 1, "matrix": [3, 7]},
+                {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 2.75, "y": 1},
+                {"matrix": [2, 1], "x": 3.75, "y": 1},
+                {"matrix": [3, 1], "x": 4.75, "y": 1},
+                {"matrix": [2, 2], "x": 5.75, "y": 1},
+                {"matrix": [3, 2], "x": 6.75, "y": 1},
+                {"matrix": [2, 3], "x": 7.75, "y": 1},
+                {"matrix": [3, 3], "x": 8.75, "y": 1},
+                {"matrix": [2, 4], "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "x": 10.75, "y": 1},
+                {"matrix": [2, 5], "x": 11.75, "y": 1},
+                {"matrix": [3, 5], "x": 12.75, "y": 1},
+                {"matrix": [2, 6], "x": 13.75, "y": 1},
+                {"matrix": [3, 7], "x": 16.25, "y": 1},
 
-              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
-              {"x": 3, "y": 2, "matrix": [5, 0]},
-              {"x": 4, "y": 2, "matrix": [4, 1]},
-              {"x": 5, "y": 2, "matrix": [5, 1]},
-              {"x": 6, "y": 2, "matrix": [4, 2]},
-              {"x": 7, "y": 2, "matrix": [5, 2]},
-              {"x": 8, "y": 2, "matrix": [4, 3]},
-              {"x": 9, "y": 2, "matrix": [5, 3]},
-              {"x": 10, "y": 2, "matrix": [4, 4]},
-              {"x": 11, "y": 2, "matrix": [5, 4]},
-              {"x": 12, "y": 2, "matrix": [4, 5]},
-              {"x": 13, "y": 2, "matrix": [5, 5]},
-              {"x": 14, "y": 2, "matrix": [4, 6]},
-              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
-              {"x": 16.25, "y": 2, "matrix": [5, 7]},
+                {"matrix": [4, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 3, "y": 2},
+                {"matrix": [4, 1], "x": 4, "y": 2},
+                {"matrix": [5, 1], "x": 5, "y": 2},
+                {"matrix": [4, 2], "x": 6, "y": 2},
+                {"matrix": [5, 2], "x": 7, "y": 2},
+                {"matrix": [4, 3], "x": 8, "y": 2},
+                {"matrix": [5, 3], "x": 9, "y": 2},
+                {"matrix": [4, 4], "x": 10, "y": 2},
+                {"matrix": [5, 4], "x": 11, "y": 2},
+                {"matrix": [4, 5], "x": 12, "y": 2},
+                {"matrix": [5, 5], "x": 13, "y": 2},
+                {"matrix": [4, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [5, 7], "x": 16.25, "y": 2},
 
-              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
-              {"x": 2.5, "y": 3, "matrix": [7, 0]},
-              {"x": 3.5, "y": 3, "matrix": [6, 1]},
-              {"x": 4.5, "y": 3, "matrix": [7, 1]},
-              {"x": 5.5, "y": 3, "matrix": [6, 2]},
-              {"x": 6.5, "y": 3, "matrix": [7, 2]},
-              {"x": 7.5, "y": 3, "matrix": [6, 3]},
-              {"x": 8.5, "y": 3, "matrix": [7, 3]},
-              {"x": 9.5, "y": 3, "matrix": [6, 4]},
-              {"x": 10.5, "y": 3, "matrix": [7, 4]},
-              {"x": 11.5, "y": 3, "matrix": [6, 5]},
-              {"x": 12.5, "y": 3, "matrix": [7, 5]},
-              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
-              {"x": 15.25, "y": 3, "matrix": [6, 7]},
-              {"x": 16.25, "y": 3, "matrix": [7, 7]},
+                {"matrix": [6, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 2.5, "y": 3},
+                {"matrix": [6, 1], "x": 3.5, "y": 3},
+                {"matrix": [7, 1], "x": 4.5, "y": 3},
+                {"matrix": [6, 2], "x": 5.5, "y": 3},
+                {"matrix": [7, 2], "x": 6.5, "y": 3},
+                {"matrix": [6, 3], "x": 7.5, "y": 3},
+                {"matrix": [7, 3], "x": 8.5, "y": 3},
+                {"matrix": [6, 4], "x": 9.5, "y": 3},
+                {"matrix": [7, 4], "x": 10.5, "y": 3},
+                {"matrix": [6, 5], "x": 11.5, "y": 3},
+                {"matrix": [7, 5], "x": 12.5, "y": 3},
+                {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 7], "x": 15.25, "y": 3},
+                {"matrix": [7, 7], "x": 16.25, "y": 3},
 
-              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
-              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
-              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
-              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
-              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
-              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
-              {"x": 14.25, "y": 4, "matrix": [9, 6]},
-              {"x": 15.25, "y": 4, "matrix": [8, 7]},
-              {"x": 16.25, "y": 4, "matrix": [9, 7]}
-          ]
+                {"matrix": [8, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4},
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [9, 7], "x": 16.25, "y": 4}
+            ]
         }
     }
 }