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, 276 insertions, 276 deletions

diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index eda564e4ed..334ace4d3a 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -38,65 +38,65 @@
                 {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
-                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
-                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
-                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
-                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
-                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
-                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
-                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
-                {"label": "K1D", "matrix": [1, 13], "x": 28, "y": 0},
-                {"label": "K1E", "matrix": [1, 14], "x": 29, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "K20", "matrix": [2, 0], "x": 30, "y": 0},
-                {"label": "K21", "matrix": [2, 1], "x": 31, "y": 0},
-                {"label": "K22", "matrix": [2, 2], "x": 32, "y": 0},
-                {"label": "K23", "matrix": [2, 3], "x": 33, "y": 0},
-                {"label": "K24", "matrix": [2, 4], "x": 34, "y": 0},
-                {"label": "K25", "matrix": [2, 5], "x": 35, "y": 0},
-                {"label": "K26", "matrix": [2, 6], "x": 36, "y": 0},
-                {"label": "K27", "matrix": [2, 7], "x": 37, "y": 0},
-                {"label": "K28", "matrix": [2, 8], "x": 38, "y": 0},
-                {"label": "K29", "matrix": [2, 9], "x": 39, "y": 0},
-                {"label": "K2A", "matrix": [2, 10], "x": 40, "y": 0},
-                {"label": "K2B", "matrix": [2, 11], "x": 41, "y": 0},
-                {"label": "K2D", "matrix": [2, 13], "x": 42, "y": 0},
-                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K32", "matrix": [3, 2], "x": 45, "y": 0},
-                {"label": "K33", "matrix": [3, 3], "x": 46, "y": 0},
-                {"label": "K34", "matrix": [3, 4], "x": 47, "y": 0},
-                {"label": "K35", "matrix": [3, 5], "x": 48, "y": 0},
-                {"label": "K36", "matrix": [3, 6], "x": 49, "y": 0},
-                {"label": "K37", "matrix": [3, 7], "x": 50, "y": 0},
-                {"label": "K38", "matrix": [3, 8], "x": 51, "y": 0},
-                {"label": "K39", "matrix": [3, 9], "x": 52, "y": 0},
-                {"label": "K3A", "matrix": [3, 10], "x": 53, "y": 0},
-                {"label": "K3B", "matrix": [3, 11], "x": 54, "y": 0},
-                {"label": "K3C", "matrix": [3, 12], "x": 55, "y": 0},
-                {"label": "K3D", "matrix": [3, 13], "x": 56, "y": 0},
-                {"label": "K3E", "matrix": [3, 14], "x": 57, "y": 0},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "K40", "matrix": [4, 0], "x": 58, "y": 0},
-                {"label": "K41", "matrix": [4, 1], "x": 59, "y": 0},
-                {"label": "K42", "matrix": [4, 2], "x": 60, "y": 0},
-                {"label": "K46", "matrix": [4, 6], "x": 61, "y": 0},
-                {"label": "K49", "matrix": [4, 9], "x": 62, "y": 0},
-                {"label": "K4A", "matrix": [4, 10], "x": 63, "y": 0},
-                {"label": "K4B", "matrix": [4, 11], "x": 64, "y": 0},
-                {"label": "K4C", "matrix": [4, 12], "x": 65, "y": 0},
-                {"label": "K4D", "matrix": [4, 13], "x": 66, "y": 0},
-                {"label": "K4E", "matrix": [4, 14], "x": 67, "y": 0}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
@@ -114,66 +114,66 @@
                 {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
-                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
-                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
-                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
-                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
-                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
-                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
-                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
-                {"label": "K1E", "matrix": [1, 14], "x": 28, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "K20", "matrix": [2, 0], "x": 29, "y": 0},
-                {"label": "K21", "matrix": [2, 1], "x": 30, "y": 0},
-                {"label": "K22", "matrix": [2, 2], "x": 31, "y": 0},
-                {"label": "K23", "matrix": [2, 3], "x": 32, "y": 0},
-                {"label": "K24", "matrix": [2, 4], "x": 33, "y": 0},
-                {"label": "K25", "matrix": [2, 5], "x": 34, "y": 0},
-                {"label": "K26", "matrix": [2, 6], "x": 35, "y": 0},
-                {"label": "K27", "matrix": [2, 7], "x": 36, "y": 0},
-                {"label": "K28", "matrix": [2, 8], "x": 37, "y": 0},
-                {"label": "K29", "matrix": [2, 9], "x": 38, "y": 0},
-                {"label": "K2A", "matrix": [2, 10], "x": 39, "y": 0},
-                {"label": "K2B", "matrix": [2, 11], "x": 40, "y": 0},
-                {"label": "K2D", "matrix": [2, 13], "x": 41, "y": 0},
-                {"label": "K1D", "matrix": [1, 13], "x": 42, "y": 0},
-                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K31", "matrix": [3, 1], "x": 45, "y": 0},
-                {"label": "K32", "matrix": [3, 2], "x": 46, "y": 0},
-                {"label": "K33", "matrix": [3, 3], "x": 47, "y": 0},
-                {"label": "K34", "matrix": [3, 4], "x": 48, "y": 0},
-                {"label": "K35", "matrix": [3, 5], "x": 49, "y": 0},
-                {"label": "K36", "matrix": [3, 6], "x": 50, "y": 0},
-                {"label": "K37", "matrix": [3, 7], "x": 51, "y": 0},
-                {"label": "K38", "matrix": [3, 8], "x": 52, "y": 0},
-                {"label": "K39", "matrix": [3, 9], "x": 53, "y": 0},
-                {"label": "K3A", "matrix": [3, 10], "x": 54, "y": 0},
-                {"label": "K3B", "matrix": [3, 11], "x": 55, "y": 0},
-                {"label": "K3C", "matrix": [3, 12], "x": 56, "y": 0},
-                {"label": "K3D", "matrix": [3, 13], "x": 57, "y": 0},
-                {"label": "K3E", "matrix": [3, 14], "x": 58, "y": 0},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "K40", "matrix": [4, 0], "x": 59, "y": 0},
-                {"label": "K41", "matrix": [4, 1], "x": 60, "y": 0},
-                {"label": "K42", "matrix": [4, 2], "x": 61, "y": 0},
-                {"label": "K46", "matrix": [4, 6], "x": 62, "y": 0},
-                {"label": "K49", "matrix": [4, 9], "x": 63, "y": 0},
-                {"label": "K4A", "matrix": [4, 10], "x": 64, "y": 0},
-                {"label": "K4B", "matrix": [4, 11], "x": 65, "y": 0},
-                {"label": "K4C", "matrix": [4, 12], "x": 66, "y": 0},
-                {"label": "K4D", "matrix": [4, 13], "x": 67, "y": 0},
-                {"label": "K4E", "matrix": [4, 14], "x": 68, "y": 0}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_encoder": {
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 5cc58677d5..2469d57954 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -40,65 +40,65 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "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": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 1], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 9], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
@@ -116,64 +116,64 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "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": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 1], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 9], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
@@ -191,66 +191,66 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [1, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 1], "x": 45, "y": 0},
-                {"matrix": [3, 2], "x": 46, "y": 0},
-                {"matrix": [3, 3], "x": 47, "y": 0},
-                {"matrix": [3, 4], "x": 48, "y": 0},
-                {"matrix": [3, 5], "x": 49, "y": 0},
-                {"matrix": [3, 6], "x": 50, "y": 0},
-                {"matrix": [3, 7], "x": 51, "y": 0},
-                {"matrix": [3, 8], "x": 52, "y": 0},
-                {"matrix": [3, 9], "x": 53, "y": 0},
-                {"matrix": [3, 10], "x": 54, "y": 0},
-                {"matrix": [3, 11], "x": 55, "y": 0},
-                {"matrix": [3, 12], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w" :1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 9], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 12], "x": 66, "y": 0},
-                {"matrix": [4, 13], "x": 67, "y": 0},
-                {"matrix": [4, 14], "x": 68, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_encoder": {