From 17de141c9248a7a1a1814d96d1f12f36df3d6a8f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 16 May 2023 17:00:08 +1000
Subject: 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
---
 keyboards/buzzard/rev1/info.json                   |  44 --
 keyboards/cannonkeys/an_c/info.json                | 100 +--
 keyboards/cannonkeys/instant60/info.json           | 100 +--
 .../cannonkeys/satisfaction75/prototype/info.json  | 189 ++---
 keyboards/cutie_club/wraith/info.json              |  88 +--
 keyboards/dp60/info.json                           | 104 +--
 keyboards/exclusive/e65/info.json                  | 666 ++++++++---------
 keyboards/giabalanai/info.json                     | 225 +++---
 keyboards/hineybush/h60/info.json                  | 106 +--
 keyboards/hineybush/h60/keymaps/via/keymap.c       |  35 +-
 keyboards/hineybush/h660s/info.json                | 308 ++++----
 keyboards/ibnuda/squiggle/rev1/info.json           | 248 +++----
 keyboards/illusion/rosa/info.json                  |  74 +-
 keyboards/j80/info.json                            | 194 ++---
 keyboards/kbdfans/tiger80/info.json                | 378 +++++-----
 keyboards/keyboardio/model01/info.json             | 137 ++--
 keyboards/lfkeyboards/smk65/revb/info.json         |  77 --
 keyboards/lfkeyboards/smk65/revf/info.json         | 114 +--
 keyboards/marksard/treadstone48/rev1/info.json     | 384 +++++-----
 keyboards/matrix/m12og/rev2/info.json              | 196 ++---
 keyboards/matrix/me/info.json                      | 194 ++---
 keyboards/matthewdias/m3n3van/info.json            |  69 +-
 keyboards/mechlovin/kanu/info.json                 | 111 +--
 keyboards/merge/uma/info.json                      | 811 ++++++++++++---------
 keyboards/mxss/info.json                           | 117 +--
 keyboards/nasu/info.json                           | 139 ++--
 keyboards/nopunin10did/jabberwocky/v1/info.json    | 246 ++++---
 keyboards/phase_studio/titan65/soldered/info.json  | 520 ++++++-------
 keyboards/rotor/info.json                          | 170 +++--
 keyboards/salicylic_acid3/naked48/rev1/info.json   | 243 +++---
 keyboards/salicylic_acid3/naked60/rev1/info.json   | 295 ++++----
 keyboards/tkw/stoutgat/v1/info.json                | 222 +++---
 keyboards/tkw/stoutgat/v2/info.json                | 330 ++++-----
 keyboards/wilba_tech/wt80_a/info.json              | 205 +++---
 keyboards/xiudi/xd60/info.json                     | 112 +--
 keyboards/xiudi/xd68/info.json                     | 114 +--
 36 files changed, 3851 insertions(+), 3814 deletions(-)

(limited to 'keyboards')

diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index c39421c597..d0fa9603f7 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -69,50 +69,6 @@
                 {"matrix": [7, 1], "x": 10, "y": 3},
                 {"matrix": [7, 2], "x": 11, "y": 3}
             ]
-        },
-        "LAYOUT_stack": {
-            "layout": [
-                {"matrix": [0, 4], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [0, 0], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [1, 4], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [1, 2], "x": 8, "y": 0},
-                {"matrix": [1, 1], "x": 9, "y": 0},
-                {"matrix": [1, 0], "x": 10, "y": 0},
-                {"matrix": [2, 5], "x": 11, "y": 0},
-                {"matrix": [2, 4], "x": 12, "y": 0},
-                {"matrix": [2, 3], "x": 13, "y": 0},
-                {"matrix": [2, 2], "x": 14, "y": 0},
-                {"matrix": [2, 1], "x": 15, "y": 0},
-                {"matrix": [2, 0], "x": 16, "y": 0},
-                {"matrix": [3, 2], "x": 17, "y": 0},
-                {"matrix": [3, 1], "x": 18, "y": 0},
-                {"matrix": [3, 0], "x": 19, "y": 0},
-                {"matrix": [4, 0], "x": 20, "y": 0},
-                {"matrix": [4, 1], "x": 21, "y": 0},
-                {"matrix": [4, 2], "x": 22, "y": 0},
-                {"matrix": [4, 3], "x": 23, "y": 0},
-                {"matrix": [4, 4], "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": [5, 3], "x": 28, "y": 0},
-                {"matrix": [5, 4], "x": 29, "y": 0},
-                {"matrix": [5, 5], "x": 30, "y": 0},
-                {"matrix": [6, 0], "x": 31, "y": 0},
-                {"matrix": [6, 1], "x": 32, "y": 0},
-                {"matrix": [6, 2], "x": 33, "y": 0},
-                {"matrix": [6, 3], "x": 34, "y": 0},
-                {"matrix": [6, 4], "x": 35, "y": 0},
-                {"matrix": [6, 5], "x": 36, "y": 0},
-                {"matrix": [7, 0], "x": 37, "y": 0},
-                {"matrix": [7, 1], "x": 38, "y": 0},
-                {"matrix": [7, 2], "x": 39, "y": 0}
-            ]
         }
     }
 }
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index cfe0729e9d..d3b73e3109 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -182,54 +182,58 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "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": [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, 14], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 14], "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, 5], "x": 58, "y": 0},
-                {"matrix": [4, 9], "x": 59, "y": 0},
-                {"matrix": [4, 10], "x": 60, "y": 0},
-                {"matrix": [4, 11], "x": 61, "y": 0},
-                {"matrix": [4, 14], "x": 62, "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": 13.5, "y": 1, "w" : 1.5},
+
+                {"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, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index eac890910f..31aeca1e8d 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -182,54 +182,58 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "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": [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, 14], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 14], "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, 5], "x": 58, "y": 0},
-                {"matrix": [4, 9], "x": 59, "y": 0},
-                {"matrix": [4, 10], "x": 60, "y": 0},
-                {"matrix": [4, 11], "x": 61, "y": 0},
-                {"matrix": [4, 14], "x": 62, "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": 13.5, "y": 1, "w": 1.5},
+
+                {"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, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"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, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/info.json
index af184cf1a9..9f932b6505 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/info.json
@@ -3,96 +3,105 @@
         "LAYOUT_all": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K002", "matrix": [0, 2], "x": 1, "y": 0},
-                {"label": "K003", "matrix": [0, 3], "x": 2, "y": 0},
-                {"label": "K004", "matrix": [0, 4], "x": 3, "y": 0},
-                {"label": "K005", "matrix": [0, 5], "x": 4, "y": 0},
-                {"label": "K006", "matrix": [0, 6], "x": 5, "y": 0},
-                {"label": "K007", "matrix": [0, 7], "x": 6, "y": 0},
-                {"label": "K008", "matrix": [0, 8], "x": 7, "y": 0},
-                {"label": "K009", "matrix": [0, 9], "x": 8, "y": 0},
-                {"label": "K010", "matrix": [0, 10], "x": 9, "y": 0},
-                {"label": "K011", "matrix": [0, 11], "x": 10, "y": 0},
-                {"label": "K012", "matrix": [0, 12], "x": 11, "y": 0},
-                {"label": "K013", "matrix": [0, 13], "x": 12, "y": 0},
-
-                {"label": "K100", "matrix": [1, 0], "x": 13, "y": 0},
-                {"label": "K101", "matrix": [1, 1], "x": 14, "y": 0},
-                {"label": "K102", "matrix": [1, 2], "x": 15, "y": 0},
-                {"label": "K103", "matrix": [1, 3], "x": 16, "y": 0},
-                {"label": "K104", "matrix": [1, 4], "x": 17, "y": 0},
-                {"label": "K105", "matrix": [1, 5], "x": 18, "y": 0},
-                {"label": "K106", "matrix": [1, 6], "x": 19, "y": 0},
-                {"label": "K107", "matrix": [1, 7], "x": 20, "y": 0},
-                {"label": "K108", "matrix": [1, 8], "x": 21, "y": 0},
-                {"label": "K109", "matrix": [1, 9], "x": 22, "y": 0},
-                {"label": "K110", "matrix": [1, 10], "x": 23, "y": 0},
-                {"label": "K111", "matrix": [1, 11], "x": 24, "y": 0},
-                {"label": "K112", "matrix": [1, 12], "x": 25, "y": 0},
-                {"label": "K113", "matrix": [1, 13], "x": 26, "y": 0},
-                {"label": "K114", "matrix": [1, 14], "x": 27, "y": 0},
-                {"label": "K115", "matrix": [1, 15], "x": 28, "y": 0},
-
-                {"label": "K200", "matrix": [2, 0], "x": 29, "y": 0},
-                {"label": "K201", "matrix": [2, 1], "x": 30, "y": 0},
-                {"label": "K202", "matrix": [2, 2], "x": 31, "y": 0},
-                {"label": "K203", "matrix": [2, 3], "x": 32, "y": 0},
-                {"label": "K204", "matrix": [2, 4], "x": 33, "y": 0},
-                {"label": "K205", "matrix": [2, 5], "x": 34, "y": 0},
-                {"label": "K206", "matrix": [2, 6], "x": 35, "y": 0},
-                {"label": "K207", "matrix": [2, 7], "x": 36, "y": 0},
-                {"label": "K208", "matrix": [2, 8], "x": 37, "y": 0},
-                {"label": "K209", "matrix": [2, 9], "x": 38, "y": 0},
-                {"label": "K210", "matrix": [2, 10], "x": 39, "y": 0},
-                {"label": "K211", "matrix": [2, 11], "x": 40, "y": 0},
-                {"label": "K212", "matrix": [2, 12], "x": 41, "y": 0},
-                {"label": "K213", "matrix": [2, 13], "x": 42, "y": 0},
-                {"label": "K215", "matrix": [2, 15], "x": 43, "y": 0},
-
-                {"label": "K300", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K301", "matrix": [3, 1], "x": 45, "y": 0},
-                {"label": "K302", "matrix": [3, 2], "x": 46, "y": 0},
-                {"label": "K303", "matrix": [3, 3], "x": 47, "y": 0},
-                {"label": "K304", "matrix": [3, 4], "x": 48, "y": 0},
-                {"label": "K305", "matrix": [3, 5], "x": 49, "y": 0},
-                {"label": "K306", "matrix": [3, 6], "x": 50, "y": 0},
-                {"label": "K307", "matrix": [3, 7], "x": 51, "y": 0},
-                {"label": "K308", "matrix": [3, 8], "x": 52, "y": 0},
-                {"label": "K309", "matrix": [3, 9], "x": 53, "y": 0},
-                {"label": "K310", "matrix": [3, 10], "x": 54, "y": 0},
-                {"label": "K311", "matrix": [3, 11], "x": 55, "y": 0},
-                {"label": "K312", "matrix": [3, 12], "x": 56, "y": 0},
-                {"label": "K313", "matrix": [3, 13], "x": 57, "y": 0},
-                {"label": "K315", "matrix": [3, 15], "x": 58, "y": 0},
-
-                {"label": "K400", "matrix": [4, 0], "x": 59, "y": 0},
-                {"label": "K401", "matrix": [4, 1], "x": 60, "y": 0},
-                {"label": "K402", "matrix": [4, 2], "x": 61, "y": 0},
-                {"label": "K403", "matrix": [4, 3], "x": 62, "y": 0},
-                {"label": "K404", "matrix": [4, 4], "x": 63, "y": 0},
-                {"label": "K405", "matrix": [4, 5], "x": 64, "y": 0},
-                {"label": "K406", "matrix": [4, 6], "x": 65, "y": 0},
-                {"label": "K407", "matrix": [4, 7], "x": 66, "y": 0},
-                {"label": "K408", "matrix": [4, 8], "x": 67, "y": 0},
-                {"label": "K409", "matrix": [4, 9], "x": 68, "y": 0},
-                {"label": "K410", "matrix": [4, 10], "x": 69, "y": 0},
-                {"label": "K411", "matrix": [4, 11], "x": 70, "y": 0},
-                {"label": "K412", "matrix": [4, 12], "x": 71, "y": 0},
-                {"label": "K413", "matrix": [4, 13], "x": 72, "y": 0},
-                {"label": "K415", "matrix": [4, 15], "x": 73, "y": 0},
-
-                {"label": "K500", "matrix": [5, 0], "x": 74, "y": 0},
-                {"label": "K501", "matrix": [5, 1], "x": 75, "y": 0},
-                {"label": "K502", "matrix": [5, 2], "x": 76, "y": 0},
-                {"label": "K503", "matrix": [5, 3], "x": 77, "y": 0},
-                {"label": "K505", "matrix": [5, 5], "x": 78, "y": 0},
-                {"label": "K507", "matrix": [5, 7], "x": 79, "y": 0},
-                {"label": "K509", "matrix": [5, 9], "x": 80, "y": 0},
-                {"label": "K510", "matrix": [5, 10], "x": 81, "y": 0},
-                {"label": "K511", "matrix": [5, 11], "x": 82, "y": 0},
-                {"label": "K512", "matrix": [5, 12], "x": 83, "y": 0},
-                {"label": "K513", "matrix": [5, 13], "x": 84, "y": 0},
-                {"label": "K515", "matrix": [5, 15], "x": 85, "y": 0}
+
+                {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "K114", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "K313", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K401", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K403", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K404", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K405", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K406", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K407", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K408", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K409", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K410", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K411", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K412", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K503", "matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"label": "K505", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"label": "K507", "matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
         "LAYOUT_default": {
diff --git a/keyboards/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json
index 9a0c030066..4a9809fe4a 100644
--- a/keyboards/cutie_club/wraith/info.json
+++ b/keyboards/cutie_club/wraith/info.json
@@ -19,92 +19,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_iso"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0},
-                {"matrix": [0, 7], "x": 14, "y": 0},
-                {"matrix": [2, 0], "x": 15, "y": 0},
-                {"matrix": [3, 0], "x": 16, "y": 0},
-                {"matrix": [2, 1], "x": 17, "y": 0},
-                {"matrix": [3, 1], "x": 18, "y": 0},
-                {"matrix": [2, 2], "x": 19, "y": 0},
-                {"matrix": [3, 2], "x": 20, "y": 0},
-                {"matrix": [2, 3], "x": 21, "y": 0},
-                {"matrix": [3, 3], "x": 22, "y": 0},
-                {"matrix": [2, 4], "x": 23, "y": 0},
-                {"matrix": [3, 4], "x": 24, "y": 0},
-                {"matrix": [2, 5], "x": 25, "y": 0},
-                {"matrix": [3, 5], "x": 26, "y": 0},
-                {"matrix": [2, 6], "x": 27, "y": 0},
-                {"matrix": [3, 6], "x": 28, "y": 0},
-                {"matrix": [2, 7], "x": 29, "y": 0},
-                {"matrix": [4, 0], "x": 30, "y": 0},
-                {"matrix": [5, 0], "x": 31, "y": 0},
-                {"matrix": [4, 1], "x": 32, "y": 0},
-                {"matrix": [5, 1], "x": 33, "y": 0},
-                {"matrix": [4, 2], "x": 34, "y": 0},
-                {"matrix": [5, 2], "x": 35, "y": 0},
-                {"matrix": [4, 3], "x": 36, "y": 0},
-                {"matrix": [5, 3], "x": 37, "y": 0},
-                {"matrix": [4, 4], "x": 38, "y": 0},
-                {"matrix": [5, 4], "x": 39, "y": 0},
-                {"matrix": [4, 5], "x": 40, "y": 0},
-                {"matrix": [5, 5], "x": 41, "y": 0},
-                {"matrix": [4, 6], "x": 42, "y": 0},
-                {"matrix": [4, 7], "x": 43, "y": 0},
-                {"matrix": [6, 0], "x": 44, "y": 0},
-                {"matrix": [7, 0], "x": 45, "y": 0},
-                {"matrix": [6, 1], "x": 46, "y": 0},
-                {"matrix": [7, 1], "x": 47, "y": 0},
-                {"matrix": [6, 2], "x": 48, "y": 0},
-                {"matrix": [7, 2], "x": 49, "y": 0},
-                {"matrix": [6, 3], "x": 50, "y": 0},
-                {"matrix": [7, 3], "x": 51, "y": 0},
-                {"matrix": [6, 4], "x": 52, "y": 0},
-                {"matrix": [7, 4], "x": 53, "y": 0},
-                {"matrix": [6, 5], "x": 54, "y": 0},
-                {"matrix": [7, 5], "x": 55, "y": 0},
-                {"matrix": [6, 6], "x": 56, "y": 0},
-                {"matrix": [7, 6], "x": 57, "y": 0},
-                {"matrix": [6, 7], "x": 58, "y": 0},
-                {"matrix": [8, 0], "x": 59, "y": 0},
-                {"matrix": [9, 0], "x": 60, "y": 0},
-                {"matrix": [8, 1], "x": 61, "y": 0},
-                {"matrix": [9, 1], "x": 62, "y": 0},
-                {"matrix": [8, 2], "x": 63, "y": 0},
-                {"matrix": [9, 2], "x": 64, "y": 0},
-                {"matrix": [8, 3], "x": 65, "y": 0},
-                {"matrix": [9, 3], "x": 66, "y": 0},
-                {"matrix": [8, 4], "x": 67, "y": 0},
-                {"matrix": [9, 4], "x": 68, "y": 0},
-                {"matrix": [8, 5], "x": 69, "y": 0},
-                {"matrix": [9, 5], "x": 70, "y": 0},
-                {"matrix": [8, 6], "x": 71, "y": 0},
-                {"matrix": [9, 6], "x": 72, "y": 0},
-                {"matrix": [8, 7], "x": 73, "y": 0},
-                {"matrix": [10, 0], "x": 74, "y": 0},
-                {"matrix": [10, 1], "x": 75, "y": 0},
-                {"matrix": [10, 3], "x": 76, "y": 0},
-                {"matrix": [11, 5], "x": 77, "y": 0},
-                {"matrix": [10, 6], "x": 78, "y": 0},
-                {"matrix": [11, 6], "x": 79, "y": 0},
-                {"matrix": [10, 7], "x": 80, "y": 0}
-            ]
-        },
         "LAYOUT_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json
index 05dc5bb44c..625ca2a238 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/info.json
@@ -456,56 +456,60 @@
                 {"matrix": [0, 11], "x": 12, "y": 0},
                 {"matrix": [0, 12], "x": 13, "y": 0},
                 {"matrix": [0, 13], "x": 14, "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": [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": [2, 13], "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": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [4, 0], "x": 57, "y": 0},
-                {"matrix": [4, 1], "x": 58, "y": 0},
-                {"matrix": [4, 2], "x": 59, "y": 0},
-                {"matrix": [4, 6], "x": 60, "y": 0},
-                {"matrix": [4, 10], "x": 61, "y": 0},
-                {"matrix": [4, 11], "x": 62, "y": 0},
-                {"matrix": [4, 12], "x": 63, "y": 0},
-                {"matrix": [4, 13], "x": 64, "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": [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": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"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": [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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/exclusive/e65/info.json b/keyboards/exclusive/e65/info.json
index 1c48f1e48c..3fab8ca8ab 100644
--- a/keyboards/exclusive/e65/info.json
+++ b/keyboards/exclusive/e65/info.json
@@ -47,61 +47,62 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "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, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "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, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_noblocker": {
@@ -123,61 +124,61 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "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, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "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, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "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, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wk": {
@@ -199,61 +200,62 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "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, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "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, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 6], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wkl": {
@@ -275,60 +277,61 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "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, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "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, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 13], "x": 64, "y": 0},
-                {"matrix": [4, 14], "x": 65, "y": 0},
-                {"matrix": [4, 15], "x": 66, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"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},
+                {