Move remaining `LAYOUT`s to data driven (#20422)

13 files changed, 1131 insertions, 1261 deletions

diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json
index c7934968dc..6c83157843 100644
--- a/keyboards/handwired/jn68m/info.json
+++ b/keyboards/handwired/jn68m/info.json
@@ -16,11 +16,166 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-      "LAYOUT": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
-      },
-      "LAYOUT_splitbs": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "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.25, "y": 1},
+        {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+        {"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": [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, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 14], "x": 15.25, "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, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 13], "x": 14.25, "y": 4},
+        {"matrix": [4, 14], "x": 15.25, "y": 4},
+        {"matrix": [4, 15], "x": 16.25, "y": 4}
+      ]
+    },
+    "LAYOUT_splitbs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [2, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "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.25, "y": 1},
+        {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+        {"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": [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, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 14], "x": 15.25, "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, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 13], "x": 14.25, "y": 4},
+        {"matrix": [4, 14], "x": 15.25, "y": 4},
+        {"matrix": [4, 15], "x": 16.25, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/handwired/jn68m/jn68m.h b/keyboards/handwired/jn68m/jn68m.h
deleted file mode 100644
index a5500824bb..0000000000
--- a/keyboards/handwired/jn68m/jn68m.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,           k3E, \
-    k40, k41, k42,           k45,                k49,      k4B, k4C,      k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_splitbs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,           k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,                k3E, \
-    k40, k41, k42,           k45,                k49,      k4B, k4C,           k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index a66f43fadc..8ef1cb0a84 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -10,94 +10,94 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [7, 16], "x": 0, "y": 0},
+                {"matrix": [6, 14], "x": 1, "y": 0},
+                {"matrix": [6, 15], "x": 2, "y": 0},
+                {"matrix": [6, 16], "x": 3, "y": 0},
+                {"matrix": [5, 14], "x": 4, "y": 0},
+                {"matrix": [5, 15], "x": 5, "y": 0},
+                {"matrix": [5, 16], "x": 6, "y": 0},
+                {"matrix": [7, 0], "x": 7, "y": 0},
+                {"matrix": [7, 1], "x": 8, "y": 0},
+                {"matrix": [7, 2], "x": 9, "y": 0},
+                {"matrix": [7, 3], "x": 10, "y": 0},
+                {"matrix": [7, 4], "x": 11, "y": 0},
+                {"matrix": [7, 5], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0},
+                {"matrix": [1, 10], "x": 14, "y": 0},
+                {"matrix": [1, 11], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1, "h": 1.6},
+                {"matrix": [5, 0], "x": 0, "y": 1},
+                {"matrix": [5, 10], "x": 1, "y": 1},
+                {"matrix": [5, 11], "x": 2, "y": 1},
+                {"matrix": [5, 12], "x": 3, "y": 1},
+                {"matrix": [5, 13], "x": 4, "y": 1},
+                {"matrix": [5, 7], "x": 5, "y": 1},
+                {"matrix": [5, 8], "x": 6, "y": 1},
+                {"matrix": [2, 0], "x": 7, "y": 1},
+                {"matrix": [2, 1], "x": 8, "y": 1},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [2, 3], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 9], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [6, 3], "x": 1.5, "y": 2},
+                {"matrix": [6, 4], "x": 2.5, "y": 2},
+                {"matrix": [6, 5], "x": 3.5, "y": 2},
+                {"matrix": [7, 8], "x": 4.5, "y": 2},
+                {"matrix": [7, 9], "x": 5.5, "y": 2},
+                {"matrix": [4, 0], "x": 6.5, "y": 2},
+                {"matrix": [4, 1], "x": 7.5, "y": 2},
+                {"matrix": [4, 2], "x": 8.5, "y": 2},
+                {"matrix": [4, 3], "x": 9.5, "y": 2},
+                {"matrix": [3, 0], "x": 10.5, "y": 2},
+                {"matrix": [3, 1], "x": 11.5, "y": 2},
+                {"matrix": [3, 2], "x": 12.5, "y": 2},
+                {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 2.6, "h": 1.2},
+                {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 2], "x": 3.75, "y": 3},
+                {"matrix": [7, 7], "x": 4.75, "y": 3},
+                {"matrix": [1, 0], "x": 5.75, "y": 3},
+                {"matrix": [1, 1], "x": 6.75, "y": 3},
+                {"matrix": [5, 3], "x": 7.75, "y": 3},
+                {"matrix": [5, 4], "x": 8.75, "y": 3},
+                {"matrix": [5, 5], "x": 9.75, "y": 3},
+                {"matrix": [5, 6], "x": 10.75, "y": 3},
+                {"matrix": [1, 2], "x": 11.75, "y": 3},
+                {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2},
 
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 3.8, "h": 1.2},
+                {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [7, 10], "x": 2.25, "y": 4},
+                {"matrix": [7, 11], "x": 3.25, "y": 4},
+                {"matrix": [7, 12], "x": 4.25, "y": 4},
+                {"matrix": [7, 14], "x": 5.25, "y": 4},
+                {"matrix": [0, 0], "x": 6.25, "y": 4},
+                {"matrix": [0, 1], "x": 7.25, "y": 4},
+                {"matrix": [0, 2], "x": 8.25, "y": 4},
+                {"matrix": [0, 3], "x": 9.25, "y": 4},
+                {"matrix": [0, 4], "x": 10.25, "y": 4},
+                {"matrix": [0, 5], "x": 11.25, "y": 4},
+                {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 6], "x": 14, "y": 4},
+                {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2},
 
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 5.5},
-                {"x": 9.25, "y": 5, "w": 1.25},
-                {"x": 10.5, "y": 5, "w": 1.25},
-                {"x": 11.75, "y": 5, "w": 1.25},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5}
+                {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5},
+                {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25},
+                {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 7], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
deleted file mode 100644
index 64d4f7bbc4..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \
-    k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \
-    k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \
-    k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \
-    k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \
-    k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \
-    { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \
-    { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \
-}
-
-#define MATRIX_TESTING_LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \
-    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \
-    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \
-}
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index 735c811451..b78ca3c807 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -24,624 +24,617 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R06", "x":14, "y":0},
-        {"label":"R07", "x":15, "y":0},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L30", "x":0, "y":3, "w":1.25},
-        {"label":"L31", "x":1.25, "y":3},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":1.75},
-        {"label":"R37", "x":15, "y":3},
-
-        {"label":"L40", "x":0, "y":4, "w":1.25},
-        {"label":"L41", "x":1.25, "y":4, "w":1.25},
-        {"label":"L42", "x":2.5, "y":4, "w":1.25},
-        {"label":"L43", "x":3.75, "y":4, "w":2.75},
-        {"label":"L44", "x":6.5, "y":4, "w":1.25},
-
-        {"label":"R43", "x":8.75, "y":4, "w":1.25},
-        {"label":"R44", "x":10, "y":4, "w":2},
-        {"label":"R42", "x":12, "y":4},
-        {"label":"R45", "x":13, "y":4},
-        {"label":"R46", "x":14, "y":4},
-        {"label":"R47", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+        {"matrix": [5, 0], "x": 15, "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": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.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": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.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": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+        {"matrix": [8, 0], "x": 15, "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, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+        {"matrix": [9, 5], "x": 12, "y": 4},
+        {"matrix": [9, 2], "x": 13, "y": 4},
+        {"matrix": [9, 1], "x": 14, "y": 4},
+        {"matrix": [9, 0], "x": 15, "y": 4}
       ]
     },
-
     "LAYOUT_ansi_default": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-
-        {"label":"7", "x":8, "y":0},
-        {"label":"8", "x":9, "y":0},
-        {"label":"9", "x":10, "y":0},
-        {"label":"0", "x":11, "y":0},
-        {"label":"-", "x":12, "y":0},
-        {"label":"=", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0, "w":2},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-
-        {"label":"Y", "x":7.5, "y":1},
-        {"label":"U", "x":8.5, "y":1},
-        {"label":"I", "x":9.5, "y":1},
-        {"label":"O", "x":10.5, "y":1},
-        {"label":"P", "x":11.5, "y":1},
-        {"label":"[", "x":12.5, "y":1},
-        {"label":"]", "x":13.5, "y":1},
-        {"label":"\\", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"CapsLock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-
-        {"label":"H", "x":7.75, "y":2},
-        {"label":"J", "x":8.75, "y":2},
-        {"label":"K", "x":9.75, "y":2},
-        {"label":"L", "x":10.75, "y":2},
-        {"label":";", "x":11.75, "y":2},
-        {"label":"'", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-
-        {"label":"N", "x":8.25, "y":3},
-        {"label":"M", "x":9.25, "y":3},
-        {"label":",", "x":10.25, "y":3},
-        {"label":".", "x":11.25, "y":3},
-        {"label":"/", "x":12.25, "y":3},
-        {"label":"Shift", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.75},
-        {"x":6.5, "y":4, "w":1.25},
-
-        {"x":8.75, "y":4, "w":1.25},
-        {"x":10, "y":4, "w":2},
-        {"label":"Alt", "x":12, "y":4},
-        {"label":"Win", "x":13, "y":4},
-        {"label":"Menu", "x":14, "y":4},
-        {"label":"Ctrl", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"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": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.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": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "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": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+