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

1 files changed, 437 insertions, 387 deletions

diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json
index c3a4a50326..4defa3f4f0 100644
--- a/keyboards/ziggurat/info.json
+++ b/keyboards/ziggurat/info.json
@@ -18,409 +18,459 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0},
-                {"x":16.5, "y":0},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":16, "y":1, "w":1.5},
-                {"x":17.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2, "w":2.25},
-                {"x":17.5, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":1.25},
-                {"x":3.75, "y":3},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":1.25},
-                {"x":5, "y":4, "w":1.25},
-                {"x":6.25, "y":4, "w":6.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":2},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":16, "y":1, "w":1.5},
-                {"x":17.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2, "w":2.25},
-                {"x":17.5, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":2.25},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":1.25},
-                {"x":5, "y":4, "w":1.25},
-                {"x":6.25, "y":4, "w":6.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 16], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_ansi_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":2},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":16, "y":1, "w":1.5},
-                {"x":17.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2, "w":2.25},
-                {"x":17.5, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":2.25},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4},
-                {"x":5, "y":4, "w":1.5},
-                {"x":6.5, "y":4, "w":7},
-                {"x":13.5, "y":4, "w":1.5},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 16], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 16], "x": 16, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2, "w": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":2},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":17.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2},
-                {"x":16.25, "y":1, "w":1.25, "h":2},
-                {"x":17.5, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":1.25},
-                {"x":3.75, "y":3},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":1.25},
-                {"x":5, "y":4, "w":1.25},
-                {"x":6.25, "y":4, "w":6.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 16], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+                {"matrix": [1, 16], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 17], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "x": 17.5, "y": 4}
             ]
         },
         "LAYOUT_iso_tsangan": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-                {"x":15.5, "y":0, "w":2},
-                {"x":17.5, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2.5, "y":1, "w":1.5},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
-                {"x":13, "y":1},
-                {"x":14, "y":1},
-                {"x":15, "y":1},
-                {"x":17.5, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2.5, "y":2, "w":1.75},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":15.25, "y":2},
-                {"x":16.25, "y":1, "w":1.25, "h":2},
-                {"x":17.5, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2.5, "y":3, "w":1.25},
-                {"x":3.75, "y":3},
-                {"x":4.75, "y":3},
-                {"x":5.75, "y":3},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3},
-                {"x":12.75, "y":3},
-                {"x":13.75, "y":3},
-                {"x":14.75, "y":3, "w":1.75},
-                {"x":16.5, "y":3},
-                {"x":17.5, "y":3},
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2.5, "y":4, "w":1.5},
-                {"x":4, "y":4},
-                {"x":5, "y":4, "w":1.5},
-                {"x":6.5, "y":4, "w":7},
-                {"x":13.5, "y":4, "w":1.5},
-                {"x":15.5, "y":4},
-                {"x":16.5, "y":4},
-                {"x":17.5, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 16], "x": 15.5, "y": 0, "w": 2},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 17], "x": 17.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+                {"matrix": [1, 16], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 17], "x": 17.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 15], "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "x": 17.5, "y": 4}
             ]
         }
     }