Add missing layout data for a handful of boards (#20931)

* Add missing layout data for a handful of boards

* typo

* Add missing layouts for stoutgat

* Add missing layout for j80

* Replace missing layout with alias for wraith

* Add missing layout for matrix/me

* Add missing layout for satisfaction75/prototype

* Apply suggestions from code review

* Rename wt80-a layouts

* Rename rosa layouts

* Add missing layouts for naked48

* Add missing layouts for naked60

* Add missing layouts for uma

* Remove unused and pointless `LAYOUT_stack` for buzzard

* Add missing layout for keyboardio/model01

* Add missing layout for smk65 revf

* Fix via keymap for h60

* Add missing layout for jabberwocky/v1

* Apply suggestions from code review

* Add missing layout for m3n3van

* Add missing layout for giabalanai

* Add missing layouts for treadstone48/rev1

* Add missing layouts for squiggle

* Update keyboards/marksard/treadstone48/rev1/info.json

2 files changed, 290 insertions, 248 deletions

diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index 8d09dc04ce..a378952d25 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -97,55 +97,64 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0},
-                {"matrix": [1, 0], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 7], "x": 20, "y": 0},
-                {"matrix": [1, 8], "x": 21, "y": 0},
-                {"matrix": [1, 9], "x": 22, "y": 0},
-                {"matrix": [1, 10], "x": 23, "y": 0},
-                {"matrix": [1, 11], "x": 24, "y": 0},
-                {"matrix": [5, 0], "x": 25, "y": 0},
-                {"matrix": [5, 1], "x": 26, "y": 0},
-                {"matrix": [5, 2], "x": 27, "y": 0},
-                {"matrix": [2, 0], "x": 28, "y": 0},
-                {"matrix": [2, 1], "x": 29, "y": 0},
-                {"matrix": [2, 2], "x": 30, "y": 0},
-                {"matrix": [2, 3], "x": 31, "y": 0},
-                {"matrix": [2, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [2, 6], "x": 34, "y": 0},
-                {"matrix": [2, 7], "x": 35, "y": 0},
-                {"matrix": [2, 8], "x": 36, "y": 0},
-                {"matrix": [2, 9], "x": 37, "y": 0},
-                {"matrix": [2, 10], "x": 38, "y": 0},
-                {"matrix": [2, 11], "x": 39, "y": 0},
-                {"matrix": [6, 0], "x": 40, "y": 0},
-                {"matrix": [6, 1], "x": 41, "y": 0},
-                {"matrix": [6, 2], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [4, 1], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [5, 0], "x": 15, "y": 1},
+                {"matrix": [5, 1], "x": 16, "y": 1},
+                {"matrix": [5, 2], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [6, 0], "x": 15, "y": 2},
+                {"matrix": [6, 1], "x": 16, "y": 2},
+                {"matrix": [6, 2], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         },
         "LAYOUT_with_setta21": {
@@ -156,69 +165,79 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [4, 1], "x": 13, "y": 0},
-                {"matrix": [4, 2], "x": 14, "y": 0},
-                {"matrix": [4, 3], "x": 15, "y": 0},
-                {"matrix": [4, 4], "x": 16, "y": 0},
-                {"matrix": [4, 5], "x": 17, "y": 0},
-                {"matrix": [1, 0], "x": 18, "y": 0},
-                {"matrix": [1, 1], "x": 19, "y": 0},
-                {"matrix": [1, 2], "x": 20, "y": 0},
-                {"matrix": [1, 3], "x": 21, "y": 0},
-                {"matrix": [1, 4], "x": 22, "y": 0},
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 6], "x": 24, "y": 0},
-                {"matrix": [1, 7], "x": 25, "y": 0},
-                {"matrix": [1, 8], "x": 26, "y": 0},
-                {"matrix": [1, 9], "x": 27, "y": 0},
-                {"matrix": [1, 10], "x": 28, "y": 0},
-                {"matrix": [1, 11], "x": 29, "y": 0},
-                {"matrix": [5, 1], "x": 30, "y": 0},
-                {"matrix": [5, 2], "x": 31, "y": 0},
-                {"matrix": [5, 3], "x": 32, "y": 0},
-                {"matrix": [5, 4], "x": 33, "y": 0},
-                {"matrix": [5, 5], "x": 34, "y": 0},
-                {"matrix": [2, 0], "x": 35, "y": 0},
-                {"matrix": [2, 1], "x": 36, "y": 0},
-                {"matrix": [2, 2], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [2, 4], "x": 39, "y": 0},
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 6], "x": 41, "y": 0},
-                {"matrix": [2, 7], "x": 42, "y": 0},
-                {"matrix": [2, 8], "x": 43, "y": 0},
-                {"matrix": [2, 9], "x": 44, "y": 0},
-                {"matrix": [2, 10], "x": 45, "y": 0},
-                {"matrix": [2, 11], "x": 46, "y": 0},
-                {"matrix": [6, 0], "x": 47, "y": 0},
-                {"matrix": [6, 1], "x": 48, "y": 0},
-                {"matrix": [6, 2], "x": 49, "y": 0},
-                {"matrix": [6, 3], "x": 50, "y": 0},
-                {"matrix": [6, 4], "x": 51, "y": 0},
-                {"matrix": [6, 5], "x": 52, "y": 0},
-                {"matrix": [3, 0], "x": 53, "y": 0},
-                {"matrix": [3, 1], "x": 54, "y": 0},
-                {"matrix": [3, 2], "x": 55, "y": 0},
-                {"matrix": [3, 3], "x": 56, "y": 0},
-                {"matrix": [3, 4], "x": 57, "y": 0},
-                {"matrix": [3, 5], "x": 58, "y": 0},
-                {"matrix": [3, 6], "x": 59, "y": 0},
-                {"matrix": [3, 7], "x": 60, "y": 0},
-                {"matrix": [3, 8], "x": 61, "y": 0},
-                {"matrix": [3, 9], "x": 62, "y": 0},
-                {"matrix": [3, 10], "x": 63, "y": 0},
-                {"matrix": [3, 11], "x": 64, "y": 0},
-                {"matrix": [7, 0], "x": 65, "y": 0},
-                {"matrix": [7, 2], "x": 66, "y": 0},
-                {"matrix": [7, 4], "x": 67, "y": 0},
-                {"matrix": [7, 5], "x": 68, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [4, 0], "x": 15, "y": 0, "h": 2},
+                {"matrix": [4, 1], "x": 16, "y": 0},
+                {"matrix": [4, 2], "x": 17, "y": 0},
+                {"matrix": [4, 3], "x": 18, "y": 0},
+                {"matrix": [4, 4], "x": 19, "y": 0},
+                {"matrix": [4, 5], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [5, 1], "x": 16, "y": 1},
+                {"matrix": [5, 2], "x": 17, "y": 1},
+                {"matrix": [5, 3], "x": 18, "y": 1},
+                {"matrix": [5, 4], "x": 19, "y": 1},
+                {"matrix": [5, 5], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [6, 0], "x": 15, "y": 2},
+                {"matrix": [6, 1], "x": 16, "y": 2},
+                {"matrix": [6, 2], "x": 17, "y": 2},
+                {"matrix": [6, 3], "x": 18, "y": 2},
+                {"matrix": [6, 4], "x": 19, "y": 2},
+                {"matrix": [6, 5], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+
+                {"matrix": [7, 0], "x": 15, "y": 3, "w": 2},
+                {"matrix": [7, 2], "x": 17, "y": 3, "w": 2},
+                {"matrix": [7, 4], "x": 19, "y": 3},
+                {"matrix": [7, 5], "x": 20.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index dfa7175778..a8ba143184 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -105,67 +105,78 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [1, 0], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 7], "x": 20, "y": 0},
-                {"matrix": [1, 8], "x": 21, "y": 0},
-                {"matrix": [1, 9], "x": 22, "y": 0},
-                {"matrix": [1, 10], "x": 23, "y": 0},
-                {"matrix": [1, 11], "x": 24, "y": 0},
-                {"matrix": [6, 0], "x": 25, "y": 0},
-                {"matrix": [6, 1], "x": 26, "y": 0},
-                {"matrix": [6, 2], "x": 27, "y": 0},
-                {"matrix": [2, 0], "x": 28, "y": 0},
-                {"matrix": [2, 1], "x": 29, "y": 0},
-                {"matrix": [2, 2], "x": 30, "y": 0},
-                {"matrix": [2, 3], "x": 31, "y": 0},
-                {"matrix": [2, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [2, 6], "x": 34, "y": 0},
-                {"matrix": [2, 7], "x": 35, "y": 0},
-                {"matrix": [2, 8], "x": 36, "y": 0},
-                {"matrix": [2, 9], "x": 37, "y": 0},
-                {"matrix": [2, 10], "x": 38, "y": 0},
-                {"matrix": [2, 11], "x": 39, "y": 0},
-                {"matrix": [7, 0], "x": 40, "y": 0},
-                {"matrix": [7, 1], "x": 41, "y": 0},
-                {"matrix": [7, 2], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 3], "x": 58, "y": 0},
-                {"matrix": [4, 4], "x": 59, "y": 0},
-                {"matrix": [4, 5], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 8], "x": 63, "y": 0},
-                {"matrix": [4, 9], "x": 64, "y": 0},
-                {"matrix": [4, 10], "x": 65, "y": 0},
-                {"matrix": [4, 11], "x": 66, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [5, 1], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [6, 0], "x": 15, "y": 1},
+                {"matrix": [6, 1], "x": 16, "y": 1},
+                {"matrix": [6, 2], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [7, 0], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 16, "y": 2},
+                {"matrix": [7, 2], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
             ]
         },
         "LAYOUT_with_setta21": {
@@ -176,81 +187,93 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [5, 0], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 3], "x": 15, "y": 0},
-                {"matrix": [5, 4], "x": 16, "y": 0},
-                {"matrix": [5, 5], "x": 17, "y": 0},
-                {"matrix": [1, 0], "x": 18, "y": 0},
-                {"matrix": [1, 1], "x": 19, "y": 0},
-                {"matrix": [1, 2], "x": 20, "y": 0},
-                {"matrix": [1, 3], "x": 21, "y": 0},
-                {"matrix": [1, 4], "x": 22, "y": 0},
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 6], "x": 24, "y": 0},
-                {"matrix": [1, 7], "x": 25, "y": 0},
-                {"matrix": [1, 8], "x": 26, "y": 0},
-                {"matrix": [1, 9], "x": 27, "y": 0},
-                {"matrix": [1, 10], "x": 28, "y": 0},
-                {"matrix": [1, 11], "x": 29, "y": 0},
-                {"matrix": [6, 1], "x": 30, "y": 0},
-                {"matrix": [6, 2], "x": 31, "y": 0},
-                {"matrix": [6, 3], "x": 32, "y": 0},
-                {"matrix": [6, 4], "x": 33, "y": 0},
-                {"matrix": [6, 5], "x": 34, "y": 0},
-                {"matrix": [2, 0], "x": 35, "y": 0},
-                {"matrix": [2, 1], "x": 36, "y": 0},
-                {"matrix": [2, 2], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [2, 4], "x": 39, "y": 0},
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 6], "x": 41, "y": 0},
-                {"matrix": [2, 7], "x": 42, "y": 0},
-                {"matrix": [2, 8], "x": 43, "y": 0},
-                {"matrix": [2, 9], "x": 44, "y": 0},
-                {"matrix": [2, 10], "x": 45, "y": 0},
-                {"matrix": [2, 11], "x": 46, "y": 0},
-                {"matrix": [7, 0], "x": 47, "y": 0},
-                {"matrix": [7, 1], "x": 48, "y": 0},
-                {"matrix": [7, 2], "x": 49, "y": 0},
-                {"matrix": [7, 3], "x": 50, "y": 0},
-                {"matrix": [7, 4], "x": 51, "y": 0},
-                {"matrix": [7, 5], "x": 52, "y": 0},
-                {"matrix": [3, 0], "x": 53, "y": 0},
-                {"matrix": [3, 1], "x": 54, "y": 0},
-                {"matrix": [3, 2], "x": 55, "y": 0},
-                {"matrix": [3, 3], "x": 56, "y": 0},
-                {"matrix": [3, 4], "x": 57, "y": 0},
-                {"matrix": [3, 5], "x": 58, "y": 0},
-                {"matrix": [3, 6], "x": 59, "y": 0},
-                {"matrix": [3, 7], "x": 60, "y": 0},
-                {"matrix": [3, 8], "x": 61, "y": 0},
-                {"matrix": [3, 9], "x": 62, "y": 0},
-                {"matrix": [3, 10], "x": 63, "y": 0},
-                {"matrix": [3, 11], "x": 64, "y": 0},
-                {"matrix": [8, 0], "x": 65, "y": 0},
-                {"matrix": [8, 2], "x": 66, "y": 0},
-                {"matrix": [8, 4], "x": 67, "y": 0},
-                {"matrix": [8, 5], "x": 68, "y": 0},
-                {"matrix": [4, 0], "x": 69, "y": 0},
-                {"matrix": [4, 1], "x": 70, "y": 0},
-                {"matrix": [4, 2], "x": 71, "y": 0},
-                {"matrix": [4, 3], "x": 72, "y": 0},
-                {"matrix": [4, 4], "x": 73, "y": 0},
-                {"matrix": [4, 5], "x": 74, "y": 0},
-                {"matrix": [4, 6], "x": 75, "y": 0},
-                {"matrix": [4, 7], "x": 76, "y": 0},
-                {"matrix": [4, 8], "x": 77, "y": 0},
-                {"matrix": [4, 9], "x": 78, "y": 0},
-                {"matrix": [4, 10], "x": 79, "y": 0},
-                {"matrix": [4, 11], "x": 80, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [5, 0], "x": 15, "y": 0, "h": 2},
+                {"matrix": [5, 1], "x": 16, "y": 0},
+                {"matrix": [5, 2], "x": 17, "y": 0},
+                {"matrix": [5, 3], "x": 18, "y": 0},
+                {"matrix": [5, 4], "x": 19, "y": 0},
+                {"matrix": [5, 5], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [6, 1], "x": 16, "y": 1},
+                {"matrix": [6, 2], "x": 17, "y": 1},
+                {"matrix": [6, 3], "x": 18, "y": 1},
+                {"matrix": [6, 4], "x": 19, "y": 1},
+                {"matrix": [6, 5], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [7, 0], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 16, "y": 2},
+                {"matrix": [7, 2], "x": 17, "y": 2},
+                {"matrix": [7, 3], "x": 18, "y": 2},
+                {"matrix": [7, 4], "x": 19, "y": 2},
+                {"matrix": [7, 5], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [8, 0], "x": 15, "y": 3, "w": 2},
+                {"matrix": [8, 2], "x": 17, "y": 3, "w": 2},
+                {"matrix": [8, 4], "x": 19, "y": 3},
+                {"matrix": [8, 5], "x": 20.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
             ]
         }
     }