summary refs log tree commit diff
path: root/keyboards
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-08 19:27:11 +1000
committerGitHub <noreply@github.com>2023-04-08 19:27:11 +1000
commitfd6449e42cf326bdf17eab118639faa6b0359eb7 (patch)
treeec572600024f903a939b69254bdc7b34a5f4437e /keyboards
parent41feebf9bae805f58f6712039866d1b5334c97da (diff)
Move split space/backspace layouts to data driven (#20356)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/45_ats/45_ats.h59
-rw-r--r--keyboards/45_ats/info.json318
-rw-r--r--keyboards/boardrun/bizarre/bizarre.h78
-rw-r--r--keyboards/boardrun/bizarre/info.json688
-rw-r--r--keyboards/boardrun/bizarre/keymaps/default/keymap.c36
-rw-r--r--keyboards/dyz/dyz40/dyz40.h96
-rw-r--r--keyboards/dyz/dyz40/info.json436
-rw-r--r--keyboards/evyd13/atom47/rev2/info.json103
-rw-r--r--keyboards/evyd13/atom47/rev2/rev2.h41
-rw-r--r--keyboards/evyd13/atom47/rev3/info.json199
-rw-r--r--keyboards/evyd13/atom47/rev3/rev3.h51
-rw-r--r--keyboards/evyd13/atom47/rev4/info.json199
-rw-r--r--keyboards/evyd13/atom47/rev4/rev4.h51
-rw-r--r--keyboards/evyd13/atom47/rev5/info.json103
-rw-r--r--keyboards/evyd13/atom47/rev5/rev5.c2
-rw-r--r--keyboards/evyd13/atom47/rev5/rev5.h38
-rw-r--r--keyboards/evyd13/minitomic/info.json103
-rw-r--r--keyboards/evyd13/minitomic/minitomic.h53
-rw-r--r--keyboards/flehrad/downbubble/downbubble.h111
-rw-r--r--keyboards/flehrad/downbubble/info.json1140
-rw-r--r--keyboards/generic_panda/panda65_01/info.json147
-rw-r--r--keyboards/generic_panda/panda65_01/panda65_01.h56
-rw-r--r--keyboards/handwired/swiftrax/digicarpice/digicarpice.h51
-rw-r--r--keyboards/handwired/swiftrax/digicarpice/info.json310
-rw-r--r--keyboards/handwired/swiftrax/equator/equator.h51
-rw-r--r--keyboards/handwired/swiftrax/equator/info.json152
-rw-r--r--keyboards/hineybush/physix/info.json600
-rw-r--r--keyboards/hineybush/physix/physix.c2
-rw-r--r--keyboards/hineybush/physix/physix.h87
-rw-r--r--keyboards/jels/jels60/info.json655
-rw-r--r--keyboards/jels/jels60/jels60.h95
-rw-r--r--keyboards/kb_elmo/qez/info.json223
-rw-r--r--keyboards/kb_elmo/qez/qez.h57
-rw-r--r--keyboards/kingly_keys/little_foot/info.json99
-rw-r--r--keyboards/kingly_keys/little_foot/little_foot.h35
-rwxr-xr-xkeyboards/lazydesigners/the60/rev1/info.json137
-rwxr-xr-xkeyboards/lazydesigners/the60/rev1/rev1.h32
-rw-r--r--keyboards/matthewdias/model_v/info.json275
-rw-r--r--keyboards/matthewdias/model_v/model_v.h61
-rw-r--r--keyboards/mechlovin/hex4b/hex4b.h104
-rw-r--r--keyboards/mechlovin/hex4b/info.json708
-rw-r--r--keyboards/mechlovin/olly/octagon/info.json95
-rw-r--r--keyboards/mechlovin/olly/octagon/octagon.c2
-rw-r--r--keyboards/mechlovin/olly/octagon/octagon.h37
-rwxr-xr-xkeyboards/mnk50/info.json284
-rw-r--r--keyboards/mnk50/mnk50.h71
-rw-r--r--keyboards/pearl/info.json152
-rw-r--r--keyboards/pearl/pearl.h57
-rw-r--r--keyboards/primekb/meridian/info.json152
-rw-r--r--keyboards/primekb/meridian/meridian.c2
-rw-r--r--keyboards/primekb/meridian/meridian.h52
-rw-r--r--keyboards/projectcain/relic/info.json198
-rw-r--r--keyboards/projectcain/relic/relic.c2
-rw-r--r--keyboards/projectcain/relic/relic.h80
-rw-r--r--keyboards/projectcain/vault35/info.json179
-rw-r--r--keyboards/projectcain/vault35/vault35.c2
-rw-r--r--keyboards/projectcain/vault35/vault35.h80
-rw-r--r--keyboards/projectcain/vault45/info.json266
-rw-r--r--keyboards/projectcain/vault45/vault45.c2
-rw-r--r--keyboards/projectcain/vault45/vault45.h90
-rw-r--r--keyboards/sanctified/dystopia/dystopia.h35
-rw-r--r--keyboards/sanctified/dystopia/info.json87
-rw-r--r--keyboards/skergo/info.json306
-rw-r--r--keyboards/skergo/skergo.h65
-rw-r--r--keyboards/sthlmkb/lagom/info.json768
-rw-r--r--keyboards/sthlmkb/lagom/lagom.c2
-rw-r--r--keyboards/sthlmkb/lagom/lagom.h100
67 files changed, 5445 insertions, 5563 deletions
diff --git a/keyboards/45_ats/45_ats.h b/keyboards/45_ats/45_ats.h
deleted file mode 100644
index 42d1940e6f..0000000000
--- a/keyboards/45_ats/45_ats.h
+++ /dev/null
@@ -1,59 +0,0 @@
- /* 
- Copyright 2020 Alec Penland
- Copyright 2020 Garret Gartner
-  
- 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_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,      k33,      k36,        k38,   k39,    k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3A, k3B, xxx, k3D }  \
-}
-
-#define LAYOUT_625_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,            k36,                 k39,      k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, xxx, xxx, xxx, k36, xxx, xxx, k39, k3A, k3B, xxx, k3D }  \
-}
-
-#define LAYOUT_600_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,    k1B,        k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,         k2B,   k2D, \
-    k30, k31,  k32,            k36,           k38,    k39,    k3A, k3B, k3D    \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, xxx, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, xxx, k2D }, \
-    { k30, k31, k32, xxx, xxx, xxx, k36, xxx, k38, k39, k3A, k3B, xxx, k3D }  \
-}
diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
index 303d5923e9..410a2a9ee1 100644
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -23,161 +23,185 @@
     "layouts": {
       "LAYOUT_split_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3, "w":1.25},
-          {"label":"", "x":1.25, "y":3},
-          {"label":"", "x":2.25, "y":3, "w":1.25},
-          {"label":"", "x":3.5, "y":3, "w":2.75},
-          {"label":"", "x":6.25, "y":3, "w":2.25},
-          {"label":"", "x":8.5, "y":3, "w":1.25},
-          {"label":"", "x":9.75, "y":3, "w":1.25},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
+          {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
+          {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25},
+          {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       },
       "LAYOUT_625_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"K", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3, "w":1.25},
-          {"label":"", "x":1.25, "y":3},
-          {"label":"", "x":2.25, "y":3, "w":1.25},
-          {"label":"", "x":3.5, "y":3, "w":6.25},
-          {"label":"", "x":9.75, "y":3, "w":1.25},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "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, "w": 1.25},
+          {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25},
+          {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.25},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       },
       "LAYOUT_600_space": {
         "layout": [
-          {"label":"", "x":0, "y":0},
-          {"label":"", "x":1, "y":0},
-          {"label":"", "x":2, "y":0},
-          {"label":"", "x":3, "y":0},
-          {"label":"", "x":4, "y":0},
-          {"label":"", "x":5, "y":0},
-          {"label":"", "x":6, "y":0},
-          {"label":"", "x":7, "y":0},
-          {"label":"", "x":8, "y":0},
-          {"label":"", "x":9, "y":0},
-          {"label":"", "x":10, "y":0},
-          {"label":"", "x":11, "y":0},
-          {"label":"", "x":12, "y":0},
-          {"label":"", "x":13.5, "y":0},
-          {"label":"", "x":0, "y":1, "w":1.25},
-          {"label":"", "x":1.25, "y":1},
-          {"label":"", "x":2.25, "y":1},
-          {"label":"", "x":3.25, "y":1},
-          {"label":"", "x":4.25, "y":1},
-          {"label":"", "x":5.25, "y":1},
-          {"label":"", "x":6.25, "y":1},
-          {"label":"", "x":7.25, "y":1},
-          {"label":"", "x":8.25, "y":1},
-          {"label":"", "x":9.25, "y":1},
-          {"label":"", "x":10.25, "y":1},
-          {"label":"", "x":11.25, "y":1, "w":1.75},
-          {"label":"", "x":13.5, "y":1},
-          {"label":"", "x":0, "y":2, "w":1.75},
-          {"label":"", "x":1.75, "y":2},
-          {"label":"", "x":2.75, "y":2},
-          {"label":"", "x":3.75, "y":2},
-          {"label":"", "x":4.75, "y":2},
-          {"label":"", "x":5.75, "y":2},
-          {"label":"", "x":6.75, "y":2},
-          {"label":"", "x":7.75, "y":2},
-          {"label":"", "x":8.75, "y":2},
-          {"label":"", "x":9.75, "y":2},
-          {"label":"", "x":10.75, "y":2, "w":1.25},
-          {"label":"", "x":12.25, "y":2.25},
-          {"label":"", "x":13.5, "y":2},
-          {"label":"", "x":0, "y":3},
-          {"label":"", "x":1, "y":3},
-          {"label":"", "x":2, "y":3},
-          {"label":"", "x":3, "y":3, "w":6},
-          {"label":"", "x":9, "y":3},
-          {"label":"", "x":10, "y":3},
-          {"label":"", "x":11.25, "y":3.25},
-          {"label":"", "x":12.25, "y":3.25},
-          {"label":"", "x":13.25, "y":3.25}
+          {"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.5, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+          {"matrix": [1, 1], "x": 1.25, "y": 1},
+          {"matrix": [1, 2], "x": 2.25, "y": 1},
+          {"matrix": [1, 3], "x": 3.25, "y": 1},
+          {"matrix": [1, 4], "x": 4.25, "y": 1},
+          {"matrix": [1, 5], "x": 5.25, "y": 1},
+          {"matrix": [1, 6], "x": 6.25, "y": 1},
+          {"matrix": [1, 7], "x": 7.25, "y": 1},
+          {"matrix": [1, 8], "x": 8.25, "y": 1},
+          {"matrix": [1, 9], "x": 9.25, "y": 1},
+          {"matrix": [1, 10], "x": 10.25, "y": 1},
+          {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+          {"matrix": [1, 13], "x": 13.5, "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, "w": 1.25},
+
+          {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+
+          {"matrix": [2, 13], "x": 13.5, "y": 2},
+
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
+          {"matrix": [3, 8], "x": 9, "y": 3},
+          {"matrix": [3, 9], "x": 10, "y": 3},
+
+          {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+          {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+          {"matrix": [3, 13], "x": 13.25, "y": 3.25}
         ]
       }
     }
diff --git a/keyboards/boardrun/bizarre/bizarre.h b/keyboards/boardrun/bizarre/bizarre.h
deleted file mode 100644
index 656ab673b9..0000000000
--- a/keyboards/boardrun/bizarre/bizarre.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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 LAYOUT_all( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116, \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,      \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,      k413,    k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315, KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516,  KC_NO } \
-}
-
-#define LAYOUT_ansi( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, KC_NO,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_split_bs( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116,   \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
-         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
-  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
-  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
-  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
-  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
-}
-
-#define LAYOUT_iso( \
-  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114,   k115,    \
-  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,          \
-           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,    \
-         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
-           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
-) \
-{ \
-  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115,  KC_NO,  k117 }, \
-  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315,  KC_NO, KC_NO }, \
-  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415,  KC_NO, KC_NO }, \
-  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515,  k516,  KC_NO } \
-}
diff --git a/keyboards/boardrun/bizarre/info.json b/keyboards/boardrun/bizarre/info.json
index b7add4033e..8c6253965b 100644
--- a/keyboards/boardrun/bizarre/info.json
+++ b/keyboards/boardrun/bizarre/info.json
@@ -22,390 +22,336 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace"},
-                {"y":0, "x":19.5, "label":"Bksp (Split)"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\| (ANSI)", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#~ (ISO)"},
-                {"y":2, "x":19,   "label":"Enter (ANSI or ISO)", "w":1.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\| (ISO)"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"\\", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"\\"},
-                {"y":0, "x":19.5, "label":"Del"},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                {"y":1, "x":18.75,"label":"Backspace", "w":1.5},
-                
-                
-                {"y":2, "x":1.25, "label":"Control", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"Enter", "w":2.25},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0},
+                {"matrix": [0, 15], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+                {"matrix": [1, 14], "x": 18.75, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 14], "x": 18, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"y":0, "x":0,    "label":"Home"},   
-                
-                {"y":0, "x":1.5,  "label":"Esc"},    
-                {"y":0, "x":2.5,  "label":"`"},      
-                {"y":0, "x":3.5,  "label":"1"}, 
-                
-                {"y":0, "x":4.75, "label":"2"},          
-                {"y":0, "x":5.75, "label":"3"},        
-                {"y":0, "x":6.75, "label":"4"},
-                {"y":0, "x":7.75, "label":"5"},        
-                
-                {"y":0, "x":11.25,"label":"6"},
-                {"y":0, "x":12.25,"label":"7"},
-                {"y":0, "x":13.25,"label":"8"},
-                {"y":0, "x":14.25,"label":"9"},
-                
-                {"y":0, "x":15.5, "label":"0"},
-                {"y":0, "x":16.5, "label":"-"},
-                {"y":0, "x":17.5, "label":"="},
-                {"y":0, "x":18.5, "label":"Backspace", "w":2},
-                
-                
-                {"y":1, "x":0,    "label":"End"},  
-                
-                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
-                {"y":1, "x":3.25, "label":"Q"},  
-                    
-                {"y":1, "x":4.75, "label":"W"},          
-                {"y":1, "x":5.75, "label":"E"},        
-                {"y":1, "x":6.75, "label":"R"},
-                {"y":1, "x":7.75, "label":"T"},
-                
-                {"y":1, "x":11.25,"label":"Y"},
-                {"y":1, "x":12.25,"label":"U"},
-                {"y":1, "x":13.25,"label":"I"},
-                {"y":1, "x":14.25,"label":"O"},
-                
-                {"y":1, "x":15.75,"label":"P"},
-                {"y":1, "x":16.75,"label":"["},
-                {"y":1, "x":17.75,"label":"]"},
-                
-                
-                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
-                {"y":2, "x":3,    "label":"A"},
-                
-                {"y":2, "x":4.75, "label":"S"},          
-                {"y":2, "x":5.75, "label":"D"},        
-                {"y":2, "x":6.75, "label":"F"},
-                {"y":2, "x":7.75, "label":"G"},
-                
-                {"y":2, "x":11.25,"label":"H"},
-                {"y":2, "x":12.25,"label":"J"},
-                {"y":2, "x":13.25,"label":"K"},
-                {"y":2, "x":14.25,"label":"L"},
-                
-                {"y":2, "x":16,   "label":";"},
-                {"y":2, "x":17,   "label":"'"},
-                {"y":2, "x":18,   "label":"#"},
-                {"y":1, "x":19,   "label":"Enter", "w":1.25, "h":2},
-                
-                
-                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
-                {"y":3, "x":1.75, "label":"\\"},
-                {"y":3, "x":2.75, "label":"Z"},
-                
-                {"y":3, "x":4.75, "label":"X"},          
-                {"y":3, "x":5.75, "label":"C"},        
-                {"y":3, "x":6.75, "label":"V"},
-                {"y":3, "x":7.75, "label":"B"},
-                {"y":3, "x":8.75, "label":"Super"},
-                
-                {"y":3, "x":10.25,"label":"Fn"},
-                {"y":3, "x":11.25,"label":"N"},
-                {"y":3, "x":12.25,"label":"M"},
-                {"y":3, "x":13.25,"label":","},
-                {"y":3, "x":14.25,"label":"."},
-                
-                {"y":3, "x":16.25,"label":"/"},
-                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
-                {"y":3, "x":19,   "label":"Up"},
-                
-                
-                {"y":4, "x":1.25, "label":"Control", "w":1.5},
-                
-                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
-                {"y":4, "x":7.75, "label":"Space", "w":2},
-                
-                {"y":4, "x":10.25,"label":"Space", "w":2.75},
-                {"y":4, "x":16.5, "label":"Control", "w":1.5},
-                {"y":4, "x":18,   "label":"Left"},
-                {"y":4, "x":19,   "label":"Down"},
-                {"y":4, "x":20,   "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 16], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 11.25, "y": 0},
+                {"matrix": [0, 8], "x": 12.25, "y": 0},
+                {"matrix": [0, 9], "x": 13.25, "y": 0},
+                {"matrix": [0, 10], "x": 14.25, "y": 0},
+                {"matrix": [0, 11], "x": 15.5, "y": 0},
+                {"matrix": [0, 12], "x": 16.5, "y": 0},
+                {"matrix": [0, 13], "x": 17.5, "y": 0},
+                {"matrix": [0, 14], "x": 18.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 11.25, "y": 1},
+                {"matrix": [1, 8], "x": 12.25, "y": 1},
+                {"matrix": [1, 9], "x": 13.25, "y": 1},
+                {"matrix": [1, 10], "x": 14.25, "y": 1},
+                {"matrix": [1, 11], "x": 15.75, "y": 1},
+                {"matrix": [1, 12], "x": 16.75, "y": 1},
+                {"matrix": [1, 13], "x": 17.75, "y": 1},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+
+                {"matrix": [2, 7], "x": 11.25, "y": 2},
+                {"matrix": [2, 8], "x": 12.25, "y": 2},
+                {"matrix": [2, 9], "x": 13.25, "y": 2},
+                {"matrix": [2, 10], "x": 14.25, "y": 2},
+                {"matrix": [2, 11], "x": 16, "y": 2},
+                {"matrix": [2, 12], "x": 17, "y": 2},
+                {"matrix": [2, 13], "x": 18, "y": 2},
+                {"matrix": [2, 14], "x": 19, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [4, 6], "x": 8.75, "y": 3},
+
+                {"matrix": [4, 7], "x": 10.25, "y": 3},
+                {"matrix": [3, 7], "x": 11.25, "y": 3},
+                {"matrix": [3, 8], "x": 12.25, "y": 3},
+                {"matrix": [3, 9], "x": 13.25, "y": 3},
+                {"matrix": [3, 10], "x": 14.25, "y": 3},
+                {"matrix": [3, 11], "x": 16.25, "y": 3},
+                {"matrix": [3, 12], "x": 17.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 19, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 2},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 18, "y": 4},
+                {"matrix": [4, 14], "x": 19, "y": 4},
+                {"matrix": [4, 15], "x": 20, "y": 4}
             ]
         }
-        
     }
-
 }
diff --git a/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
index f27c7a2c30..91a1ab1084 100644
--- a/keyboards/boardrun/bizarre/keymaps/default/keymap.c
+++ b/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -27,15 +27,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /*Bizarre Base Layer (defaults for "any" layout)
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
+    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ FN    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */
     
@@ -49,15 +49,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     
     /*Bizarre Function Layer
     * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
-    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
-    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
-    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
-    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
-    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
-    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
-    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
-    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
-    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    * ¦ QK_BOOT ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
     *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
     */
     
diff --git a/keyboards/dyz/dyz40/dyz40.h b/keyboards/dyz/dyz40/dyz40.h
deleted file mode 100644
index 8a70432196..0000000000
--- a/keyboards/dyz/dyz40/dyz40.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2021 dayatz
- *
- * 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 _X_ KC_NO
-
-/*                                             ┌───────â”
- *                                             │0B     │ 2u Backspace
- *                                             └───────┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───â”
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │
- * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
- * │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B    │
- * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B  │
- * ├─────┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┴────┤
- * │30   │31 │32   │33      │37        │3A   │3B │3C   │
- * └─────┴───┴─────┴────────┴──────────┴─────┴───┴─────┘
- * ┌─────┬─────┬───────────────────────────┬─────┬─────â”
- * │30   │31   │36                         │3B   │3C   │ 7u Space
- * └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,           K36, K37,           K3A, K3B, K3C \
-) { \
-    { K00,  K01,  K02,  K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10,  K11,  K12,  K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20,  K21,  K22,  K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30,  K31,  K32,  K33, _X_, _X_, K36, K37, _X_, _X_, K3A, K3B, K3C } \
-}
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31,                K36,                     K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, _X_ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, _X_, _X_, _X_, _X_, K36, _X_, _X_, _X_, _X_, K3B, K3C }  \
-}
-
-#define LAYOUT_7u_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31,                K36,                     K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, _X_, _X_, _X_, _X_, K36, _X_, _X_, _X_, _X_, K3B, K3C }  \
-}
-
-#define LAYOUT_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K33, K37,           K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, _X_ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, K32, K33, _X_, _X_, _X_, K37, _X_, _X_, K3A, K3B, K3C }  \
-}
-
-#define LAYOUT_split_space_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K33, K37,           K3A, K3B, K3C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \
-    { K30, K31, K32, K33, _X_, _X_, _X_, K37, _X_, _X_, K3A, K3B, K3C }  \
-}
diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index 09f7e8e700..bb54647fed 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -44,255 +44,255 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"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, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"7uSpace", "x":3, "y":4, "w":7},
-                {"label":"Fn2", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_7u_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Bksp", "x":11, "y":0, "w":2},
+                {"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, "w": 2},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"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, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":3, "w":1.5},
-                {"label":"7uSpace", "x":3, "y":3, "w":7},
-                {"label":"Alt", "x":10, "y":3, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 7},
+                {"matrix": [3, 11], "x": 10, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_7u_space_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"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, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Alt", "x":1.5, "y":3, "w":1.5},
-                {"label":"7uSpace", "x":3, "y":3, "w":7},
-                {"label":"Alt", "x":10, "y":3, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 3, "y": 3, "w": 7},
+                {"matrix": [3, 11], "x": 10, "y": 3, "w": 1.5},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_split_space": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Bksp", "x":11, "y":0, "w":2},
+                {"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, "w": 2},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"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, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"Fn", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_split_space_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"[{", "x":11, "y":0},
-                {"label":"]}", "x":12, "y":0},
+                {"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},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":"'\"", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":",<", "x":8.75, "y":2},
-                {"label":".>", "x":9.75, "y":2},
-                {"label":"/?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"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, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3, "w":1.5},
-                {"label":"Win", "x":1.5, "y":3},
-                {"label":"Alt", "x":2.5, "y":3, "w":1.5},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"Fn", "x":6.25, "y":3, "w":2.75},
-                {"label":"Alt", "x":9, "y":3, "w":1.5},
-                {"label":"Win", "x":10.5, "y":3},
-                {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9, "y": 3, "w": 1.5},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev2/info.json b/keyboards/evyd13/atom47/rev2/info.json
index cdc0a9a000..445aa8db9b 100644
--- a/keyboards/evyd13/atom47/rev2/info.json
+++ b/keyboards/evyd13/atom47/rev2/info.json
@@ -31,59 +31,62 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, "w": 1.75},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev2/rev2.h b/keyboards/evyd13/atom47/rev2/rev2.h
deleted file mode 100644
index 4c4949ad08..0000000000
--- a/keyboards/evyd13/atom47/rev2/rev2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,      k2c, \
-  k30, k31, k32, k33, k34,      k36,      k38, k39, k3a,      k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c}, \
-  {k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3a, XXX, k3c}  \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
diff --git a/keyboards/evyd13/atom47/rev3/info.json b/keyboards/evyd13/atom47/rev3/info.json
index 2dd1ca5015..39c5325bae 100644
--- a/keyboards/evyd13/atom47/rev3/info.json
+++ b/keyboards/evyd13/atom47/rev3/info.json
@@ -32,111 +32,114 @@
     },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_full_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":6},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 7], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev3/rev3.h b/keyboards/evyd13/atom47/rev3/rev3.h
deleted file mode 100644
index aa2e53ba22..0000000000
--- a/keyboards/evyd13/atom47/rev3/rev3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
-
-#define LAYOUT_full_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32,                k37,           k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, XXX, XXX, XXX, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json
index bf2e6b69ac..1e83924bad 100644
--- a/keyboards/evyd13/atom47/rev4/info.json
+++ b/keyboards/evyd13/atom47/rev4/info.json
@@ -29,111 +29,114 @@
     },
     "processor": "atmega32u2",
     "bootloader": "qmk-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_full_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":6},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 7], "x": 3, "y": 3, "w": 6},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev4/rev4.h b/keyboards/evyd13/atom47/rev4/rev4.h
deleted file mode 100644
index aa2e53ba22..0000000000
--- a/keyboards/evyd13/atom47/rev4/rev4.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
-
-#define LAYOUT_full_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32,                k37,           k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, XXX, XXX, XXX, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/atom47/rev5/info.json b/keyboards/evyd13/atom47/rev5/info.json
index b336beab58..30005a992c 100644
--- a/keyboards/evyd13/atom47/rev5/info.json
+++ b/keyboards/evyd13/atom47/rev5/info.json
@@ -18,59 +18,62 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
+   "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_split_space"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "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":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1, "w":1.75},
-                
-                {"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, "w":1.25},
-                {"x":12, "y":2},
-                
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3, "w":1.75},
-                {"x":6, "y":3, "w":2.75},
-                {"x":8.75, "y":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":11.75, "y":3, "w":1.25}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+                {"matrix": [2, 12], "x": 12, "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, 5], "x": 4.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 3336d8cf8b..adec48e6bb 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev5.h"
+#include "quantum.h"
 
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/evyd13/atom47/rev5/rev5.h b/keyboards/evyd13/atom47/rev5/rev5.h
deleted file mode 100644
index 874dc285ab..0000000000
--- a/keyboards/evyd13/atom47/rev5/rev5.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2021 Evelien Dekkers
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT_all LAYOUT_split_space
-
-#define LAYOUT_split_space( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
-  k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
-  k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
-  {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
-  {k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
-}
diff --git a/keyboards/evyd13/minitomic/info.json b/keyboards/evyd13/minitomic/info.json
index 45641c27d7..1948089272 100644
--- a/keyboards/evyd13/minitomic/info.json
+++ b/keyboards/evyd13/minitomic/info.json
@@ -26,10 +26,109 @@
   "bootloader": "qmk-dfu",
   "layouts": {
     "LAYOUT_split_space": {
-      "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":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"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, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+      "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+        {"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, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 2.5, "y": 3},
+        {"matrix": [3, 3], "x": 3.5, "y": 3},
+        {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25}
+      ]
     },
     "LAYOUT_full_space": {
-      "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":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"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, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3, "w":6.25}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+      "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1},
+        {"matrix": [1, 2], "x": 2.25, "y": 1},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1},
+        {"matrix": [1, 5], "x": 5.25, "y": 1},
+        {"matrix": [1, 6], "x": 6.25, "y": 1},
+        {"matrix": [1, 7], "x": 7.25, "y": 1},
+        {"matrix": [1, 8], "x": 8.25, "y": 1},
+        {"matrix": [1, 9], "x": 9.25, "y": 1},
+        {"matrix": [1, 10], "x": 10.25, "y": 1},
+        {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75},
+
+        {"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, "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, 6], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 9], "x": 9.5, "y": 3},
+        {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25}
+      ]
     }
   }
 }
diff --git a/keyboards/evyd13/minitomic/minitomic.h b/keyboards/evyd13/minitomic/minitomic.h
deleted file mode 100644
index da98ebcf12..0000000000
--- a/keyboards/evyd13/minitomic/minitomic.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1b,    \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    \
-    k30, k31, k32, k33,      k34,      k36,      k37, k39, k3a, k3b     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
-    { k30, k31, k32, k33, k34, XXX, k36, k37, XXX, k39, k3a, k3b, XXX }  \
-}
-
-#define LAYOUT_full_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1b,    \
-    k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    \
-    k30, k31, k32,                k36,                k39, k3a, k3b     \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
-    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, k3a, k3b, XXX }  \
-}
diff --git a/keyboards/flehrad/downbubble/downbubble.h b/keyboards/flehrad/downbubble/downbubble.h
deleted file mode 100644
index 0df39dd9ee..0000000000
--- a/keyboards/flehrad/downbubble/downbubble.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* Copyright 2018 REPLACE_WITH_YOUR_NAME
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_standard( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518, K519  \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_bs( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   K117,   K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_rshift( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,               K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K29,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,               K410,  K411,  K412,  K413,  K414,         K416,  K417,  K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,        K58,  K49,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    KC_NO,  K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   K417,   K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  KC_NO,  K58,    KC_NO,  K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_split_numpad( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,         K116,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K39,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,  K49,         K410,  K411,  K412,  K413,  K414,         K416,         K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,  K57,  K58,  K59,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,   K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   KC_NO,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,   K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    K39,    K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,   KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   KC_NO,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  K57,    K58,    K59,    K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,   K518,   K519  }, \
-         }
-
-#define LAYOUT_all( \
-    K00,  K01,  K02,  K03,  K04,  K05,  K06,                                       K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,\
-    K10,  K11,  K12,  K13,  K14,  K15,  K16,              K17,  K18,  K19,         K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,\
-    K20,  K21,  K22,  K23,  K24,  K25,              K26,  K27,  K28,  K29,         K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,\
-    K30,  K31,  K32,  K33,  K34,  K35,              K36,  K37,  K38,  K39,         K310,  K311,  K312,  K313,  K314,  K315,         K317,              \
-    K40,        K41,  K42,  K43,  K44,  K45,        K46,  K47,  K48,  K49,         K410,  K411,  K412,  K413,  K414,         K416,  K417,  K418,       \
-    K50,  K51,  K52,  K53,        K54,              K56,  K57,  K58,  K59,         K510,         K512,  K513,  K514,  K516,         K517,  K518,  K519 \
-) \
-{ \
-    { K00,  K01,  K02,  K03,  K04,  K05,    K06,  KC_NO,  KC_NO,  KC_NO,  K010,  K011,   K012,  K013,  K014,  K015,   K016,   K017,  K018,   K019  }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,    K16,  K17,    K18,    K19,    K110,  K111,   K112,  K113,  K114,  K115,   K116,   K117,  K118,   K119  }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,    K26,  K27,    K28,    K29,    K210,  K211,   K212,  K213,  K214,  K215,   K216,   K217,  K218,   K219  }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,    K36,  K37,    K38,    K39,    K310,  K311,   K312,  K313,  K314,  K315,   KC_NO,  K317,  KC_NO,  KC_NO }, \
-    { K40,  K41,  K42,  K43,  K44,  K45,    K46,  K47,    K48,    K49,    K410,  K411,   K412,  K413,  K414,  KC_NO,  K416,   K417,  K418,   KC_NO }, \
-    { K50,  K51,  K52,  K53,  K54,  KC_NO,  K56,  K57,    K58,    K59,    K510,  KC_NO,  K512,  K513,  K514,  KC_NO,  K516,   K517,  K518,   K519  }, \
-         }
diff --git a/keyboards/flehrad/downbubble/info.json b/keyboards/flehrad/downbubble/info.json
index 77cdd44ee0..fa81b51e42 100644
--- a/keyboards/flehrad/downbubble/info.json
+++ b/keyboards/flehrad/downbubble/info.json
@@ -17,552 +17,632 @@
   "layouts": {
     "LAYOUT_standard": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"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, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_bs": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1},
-        {"label":"K117", "x":19.75, "y":1},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"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, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1},
+        {"matrix": [1, 17], "x": 19.75, "y": 1},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_rshift": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K29", "x":10.75, "y":2, "h":2},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":1.75},
-        {"label":"K417", "x":19.75, "y":4},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5, "w":2},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K49", "x":10.75, "y":4, "h":2},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"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, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [2, 9], "x": 10.75, "y": 2, "h": 2},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 1.75},
+        {"matrix": [4, 17], "x": 19.75, "y": 4},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5, "w": 2},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4, "h": 2},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_split_numpad": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1, "w":2},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K17", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K29", "x":10.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K39", "x":10.75, "y":3},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K49", "x":10.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":2.75},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5},
-        {"label":"K57", "x":8.75, "y":5},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K59", "x":10.75, "y":5},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"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, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1, "w": 2},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+        {"matrix": [2, 9], "x": 10.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [3, 9], "x": 10.75, "y": 3},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+        {"matrix": [4, 9], "x": 10.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 2.75},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5},
+        {"matrix": [5, 7], "x": 8.75, "y": 5},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [5, 9], "x": 10.75, "y": 5},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     },
     "LAYOUT_all": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K05", "x":5, "y":0},
-        {"label":"K06", "x":6, "y":0},
-        {"label":"K010", "x":12.75, "y":0},
-        {"label":"K011", "x":13.75, "y":0},
-        {"label":"K012", "x":14.75, "y":0},
-        {"label":"K013", "x":15.75, "y":0},
-        {"label":"K014", "x":16.75, "y":0},
-        {"label":"K015", "x":17.75, "y":0},
-        {"label":"K016", "x":18.75, "y":0},
-        {"label":"K017", "x":19.75, "y":0},
-        {"label":"K018", "x":20.75, "y":0},
-        {"label":"K019", "x":21.75, "y":0},
-        {"label":"K10", "x":0, "y":1},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K15", "x":5, "y":1},
-        {"label":"K16", "x":6, "y":1},
-        {"label":"K17", "x":8.75, "y":1},
-        {"label":"K18", "x":9.75, "y":1},
-        {"label":"K19", "x":10.75, "y":1},
-        {"label":"K110", "x":12.75, "y":1},
-        {"label":"K111", "x":13.75, "y":1},
-        {"label":"K112", "x":14.75, "y":1},
-        {"label":"K113", "x":15.75, "y":1},
-        {"label":"K114", "x":16.75, "y":1},
-        {"label":"K115", "x":17.75, "y":1},
-        {"label":"K116", "x":18.75, "y":1},
-        {"label":"K117", "x":19.75, "y":1},
-        {"label":"K118", "x":20.75, "y":1},
-        {"label":"K119", "x":21.75, "y":1},
-        {"label":"K20", "x":0, "y":2, "w":1.5},
-        {"label":"K21", "x":1.5, "y":2},
-        {"label":"K22", "x":2.5, "y":2},
-        {"label":"K23", "x":3.5, "y":2},
-        {"label":"K24", "x":4.5, "y":2},
-        {"label":"K25", "x":5.5, "y":2},
-        {"label":"K26", "x":7.75, "y":2},
-        {"label":"K27", "x":8.75, "y":2},
-        {"label":"K28", "x":9.75, "y":2},
-        {"label":"K29", "x":10.75, "y":2},
-        {"label":"K210", "x":12.25, "y":2},
-        {"label":"K211", "x":13.25, "y":2},
-        {"label":"K212", "x":14.25, "y":2},
-        {"label":"K213", "x":15.25, "y":2},
-        {"label":"K214", "x":16.25, "y":2},
-        {"label":"K215", "x":17.25, "y":2},
-        {"label":"K216", "x":18.25, "y":2},
-        {"label":"K217", "x":19.25, "y":2, "w":1.5},
-        {"label":"K218", "x":20.75, "y":2},
-        {"label":"K219", "x":21.75, "y":2},
-        {"label":"K30", "x":0, "y":3, "w":1.75},
-        {"label":"K31", "x":1.75, "y":3},
-        {"label":"K32", "x":2.75, "y":3},
-        {"label":"K33", "x":3.75, "y":3},
-        {"label":"K34", "x":4.75, "y":3},
-        {"label":"K35", "x":5.75, "y":3},
-        {"label":"K36", "x":7.75, "y":3},
-        {"label":"K37", "x":8.75, "y":3},
-        {"label":"K38", "x":9.75, "y":3},
-        {"label":"K39", "x":10.75, "y":3},
-        {"label":"K310", "x":12.5, "y":3},
-        {"label":"K311", "x":13.5, "y":3},
-        {"label":"K312", "x":14.5, "y":3},
-        {"label":"K313", "x":15.5, "y":3},
-        {"label":"K314", "x":16.5, "y":3},
-        {"label":"K315", "x":17.5, "y":3},
-        {"label":"K317", "x":18.5, "y":3, "w":2.25},
-        {"label":"K40", "x":0, "y":4, "w":2.25},
-        {"label":"K41", "x":2.25, "y":4},
-        {"label":"K42", "x":3.25, "y":4},
-        {"label":"K43", "x":4.25, "y":4},
-        {"label":"K44", "x":5.25, "y":4},
-        {"label":"K45", "x":6.25, "y":4},
-        {"label":"K46", "x":7.75, "y":4},
-        {"label":"K47", "x":8.75, "y":4},
-        {"label":"K48", "x":9.75, "y":4},
-        {"label":"K49", "x":10.75, "y":4},
-        {"label":"K410", "x":13, "y":4},
-        {"label":"K411", "x":14, "y":4},
-        {"label":"K412", "x":15, "y":4},
-        {"label":"K413", "x":16, "y":4},
-        {"label":"K414", "x":17, "y":4},
-        {"label":"K416", "x":18, "y":4, "w":1.75},
-        {"label":"K417", "x":19.75, "y":4},
-        {"label":"K418", "x":20.75, "y":4},
-        {"label":"K50", "x":0, "y":5, "w":1.25},
-        {"label":"K51", "x":1.25, "y":5, "w":1.25},
-        {"label":"K52", "x":2.5, "y":5, "w":1.25},
-        {"label":"K53", "x":3.75, "y":5, "w":1.25},
-        {"label":"K54", "x":5, "y":5, "w":2.25},
-        {"label":"K56", "x":7.75, "y":5},
-        {"label":"K57", "x":8.75, "y":5},
-        {"label":"K58", "x":9.75, "y":5},
-        {"label":"K59", "x":10.75, "y":5},
-        {"label":"K510", "x":13, "y":5, "w":2},
-        {"label":"K512", "x":15, "y":5, "w":1.25},
-        {"label":"K513", "x":16.25, "y":5, "w":1.25},
-        {"label":"K514", "x":17.5, "y":5, "w":1.25},
-        {"label":"K516", "x":18.75, "y":5},
-        {"label":"K517", "x":19.75, "y":5},
-        {"label":"K518", "x":20.75, "y":5},
-        {"label":"K519", "x":21.75, "y":5}
+        {"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, 10], "x": 12.75, "y": 0},
+        {"matrix": [0, 11], "x": 13.75, "y": 0},
+        {"matrix": [0, 12], "x": 14.75, "y": 0},
+        {"matrix": [0, 13], "x": 15.75, "y": 0},
+        {"matrix": [0, 14], "x": 16.75, "y": 0},
+        {"matrix": [0, 15], "x": 17.75, "y": 0},
+        {"matrix": [0, 16], "x": 18.75, "y": 0},
+        {"matrix": [0, 17], "x": 19.75, "y": 0},
+        {"matrix": [0, 18], "x": 20.75, "y": 0},
+        {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+
+        {"matrix": [1, 7], "x": 8.75, "y": 1},
+        {"matrix": [1, 8], "x": 9.75, "y": 1},
+        {"matrix": [1, 9], "x": 10.75, "y": 1},
+
+        {"matrix": [1, 10], "x": 12.75, "y": 1},
+        {"matrix": [1, 11], "x": 13.75, "y": 1},
+        {"matrix": [1, 12], "x": 14.75, "y": 1},
+        {"matrix": [1, 13], "x": 15.75, "y": 1},
+        {"matrix": [1, 14], "x": 16.75, "y": 1},
+        {"matrix": [1, 15], "x": 17.75, "y": 1},
+        {"matrix": [1, 16], "x": 18.75, "y": 1},
+        {"matrix": [1, 17], "x": 19.75, "y": 1},
+        {"matrix": [1, 18], "x": 20.75, "y": 1},
+        {"matrix": [1, 19], "x": 21.75, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2},
+        {"matrix": [2, 2], "x": 2.5, "y": 2},
+        {"matrix": [2, 3], "x": 3.5, "y": 2},
+        {"matrix": [2, 4], "x": 4.5, "y": 2},
+        {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+        {"matrix": [2, 6], "x": 7.75, "y": 2},
+        {"matrix": [2, 7], "x": 8.75, "y": 2},
+        {"matrix": [2, 8], "x": 9.75, "y": 2},
+        {"matrix": [2, 9], "x": 10.75, "y": 2},
+
+        {"matrix": [2, 10], "x": 12.25, "y": 2},
+        {"matrix": [2, 11], "x": 13.25, "y": 2},
+        {"matrix": [2, 12], "x": 14.25, "y": 2},
+        {"matrix": [2, 13], "x": 15.25, "y": 2},
+        {"matrix": [2, 14], "x": 16.25, "y": 2},
+        {"matrix": [2, 15], "x": 17.25, "y": 2},
+        {"matrix": [2, 16], "x": 18.25, "y": 2},
+        {"matrix": [2, 17], "x": 19.25, "y": 2, "w": 1.5},
+        {"matrix": [2, 18], "x": 20.75, "y": 2},
+        {"matrix": [2, 19], "x": 21.75, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3},
+        {"matrix": [3, 2], "x": 2.75, "y": 3},
+        {"matrix": [3, 3], "x": 3.75, "y": 3},
+        {"matrix": [3, 4], "x": 4.75, "y": 3},
+        {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+        {"matrix": [3, 6], "x": 7.75, "y": 3},
+        {"matrix": [3, 7], "x": 8.75, "y": 3},
+        {"matrix": [3, 8], "x": 9.75, "y": 3},
+        {"matrix": [3, 9], "x": 10.75, "y": 3},
+
+        {"matrix": [3, 10], "x": 12.5, "y": 3},
+        {"matrix": [3, 11], "x": 13.5, "y": 3},
+        {"matrix": [3, 12], "x": 14.5, "y": 3},
+        {"matrix": [3, 13], "x": 15.5, "y": 3},
+        {"matrix": [3, 14], "x": 16.5, "y": 3},
+        {"matrix": [3, 15], "x": 17.5, "y": 3},
+        {"matrix": [3, 17], "x": 18.5, "y": 3, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4},
+        {"matrix": [4, 2], "x": 3.25, "y": 4},
+        {"matrix": [4, 3], "x": 4.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.25, "y": 4},
+        {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+        {"matrix": [4, 6], "x": 7.75, "y": 4},
+        {"matrix": [4, 7], "x": 8.75, "y": 4},
+        {"matrix": [4, 8], "x": 9.75, "y": 4},
+        {"matrix": [4, 9], "x": 10.75, "y": 4},
+
+        {"matrix": [4, 10], "x": 13, "y": 4},
+        {"matrix": [4, 11], "x": 14, "y": 4},
+        {"matrix": [4, 12], "x": 15, "y": 4},
+        {"matrix": [4, 13], "x": 16, "y": 4},
+        {"matrix": [4, 14], "x": 17, "y": 4},
+        {"matrix": [4, 16], "x": 18, "y": 4, "w": 1.75},
+        {"matrix": [4, 17], "x": 19.75, "y": 4},
+        {"matrix": [4, 18], "x": 20.75, "y": 4},
+
+        {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5, "w": 1.25},
+        {"matrix": [5, 4], "x": 5, "y": 5, "w": 2.25},
+
+        {"matrix": [5, 6], "x": 7.75, "y": 5},
+        {"matrix": [5, 7], "x": 8.75, "y": 5},
+        {"matrix": [5, 8], "x": 9.75, "y": 5},
+        {"matrix": [5, 9], "x": 10.75, "y": 5},
+
+        {"matrix": [5, 10], "x": 13, "y": 5, "w": 2},
+        {"matrix": [5, 12], "x": 15, "y": 5, "w": 1.25},
+        {"matrix": [5, 13], "x": 16.25, "y": 5, "w": 1.25},
+        {"matrix": [5, 14], "x": 17.5, "y": 5, "w": 1.25},
+        {"matrix": [5, 16], "x": 18.75, "y": 5},
+        {"matrix": [5, 17], "x": 19.75, "y": 5},
+        {"matrix": [5, 18], "x": 20.75, "y": 5},
+        {"matrix": [5, 19], "x": 21.75, "y": 5}
       ]
     }
   }
diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json
index fe6292d80f..8e8b58b5c0 100644
--- a/keyboards/generic_panda/panda65_01/info.json
+++ b/keyboards/generic_panda/panda65_01/info.json
@@ -17,10 +17,153 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_split_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"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":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "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":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgDn", "x":15, "y":2}, {"label":"LShift", "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":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]
+            "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "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, 3], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 10.75, "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_full_bs": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"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":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "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":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PGdn", "x":15, "y":2}, {"label":"LShift", "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":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]
+            "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, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "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, 3], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 10.75, "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}
+            ]
         }
     }
 }
diff --git a/keyboards/generic_panda/panda65_01/panda65_01.h b/keyboards/generic_panda/panda65_01/panda65_01.h
deleted file mode 100644
index 0a4de225ab..0000000000
--- a/keyboards/generic_panda/panda65_01/panda65_01.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2020 generic_panda
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,             k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
-    k400,       k402,                   k406,                         k411,       k413, k414, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
-    { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
-    { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
-    { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \
-    { k400,  KC_NO, KC_NO, k402,  k406,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k411,  KC_NO, k413,  k414,  k415 }  \
-}
-
-#define LAYOUT_full_bs( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,       k014, k015, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,       k115, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,             k215, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,             k314, k315, \
-    k400,       k402,                   k406,                         k411,       k413, k414, k415  \
-) { \
-    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  KC_NO, k014,  k015 },  \
-    { k100,  KC_NO, k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k115 }, \
-    { k200,  KC_NO, k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  k212,  KC_NO, k215 }, \
-    { k300,  KC_NO, KC_NO, k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k314,  k315 }, \
-    { k400,  KC_NO, KC_NO, k402,  k406,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k411,  KC_NO, k413,  k414,  k415 }  \
-}
-
diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h b/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
deleted file mode 100644
index c8baf3e2f8..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-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 K_NO KC_NO
-
-#define LAYOUT_unified_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json
index 7e92b0a59c..538a39c14b 100644
--- a/keyboards/handwired/swiftrax/digicarpice/info.json
+++ b/keyboards/handwired/swiftrax/digicarpice/info.json
@@ -18,155 +18,175 @@
     "layouts": {
         "LAYOUT_unified_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0, "w":2},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0},
-                {"label":"2,12", "x":16.68, "y":0},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0},
+                {"matrix": [2, 12], "x": 16.68, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/equator/equator.h b/keyboards/handwired/swiftrax/equator/equator.h
deleted file mode 100644
index 3f0350ef2b..0000000000
--- a/keyboards/handwired/swiftrax/equator/equator.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Swiftrax <swiftrax@gmail.com>
-
-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 K_NO KC_NO
-
-#define LAYOUT_unified_bs_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K312, \
-    K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K_NO},  \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
-
-#define LAYOUT_split_bs_rshift( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313, \
-    K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/info.json
index 697e23d590..3e53acb40c 100644
--- a/keyboards/handwired/swiftrax/equator/info.json
+++ b/keyboards/handwired/swiftrax/equator/info.json
@@ -17,10 +17,158 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_unified_bs_rshift": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "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":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "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": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "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": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "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": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 2.75},
+
+                {"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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_split_bs_rshift": {
-            "layout":[{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Del", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "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": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [2, 12], "x": 15.5, "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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "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": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/hineybush/physix/info.json b/keyboards/hineybush/physix/info.json
index be4e1b676a..191621ff47 100644
--- a/keyboards/hineybush/physix/info.json
+++ b/keyboards/hineybush/physix/info.json
@@ -25,294 +25,342 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_split_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"~", "x":16.25, "y":0.25},
-                {"label":"Back", "x":17.25, "y":0.25},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 12], "x": 16.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 17.25, "y": 0.25},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_275_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2.75},
-                {"label":"Right Alt", "x":11.75, "y":4.25, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_full_bksp_200_rspace": {
             "layout": [
-                {"label":"Esc", "x":0.75, "y":0.25},
-                {"label":"!", "x":1.75, "y":0.25},
-                {"label":"@", "x":2.75, "y":0.25},
-                {"label":"#", "x":4, "y":0.25},
-                {"label":"$", "x":5, "y":0.25},
-                {"label":"%", "x":6, "y":0.25},
-                {"label":"^", "x":7, "y":0.25},
-                {"label":"&", "x":10, "y":0.25},
-                {"label":"*", "x":11, "y":0.25},
-                {"label":"(", "x":12, "y":0.25},
-                {"label":")", "x":13, "y":0.25},
-                {"label":"_", "x":14.25, "y":0.25},
-                {"label":"+", "x":15.25, "y":0.25},
-                {"label":"Back", "x":16.25, "y":0.25, "w":2},
-                {"label":"Delete", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":2, "y":1.25},
-                {"label":"W", "x":3.5, "y":1.25},
-                {"label":"E", "x":4.5, "y":1.25},
-                {"label":"R", "x":5.5, "y":1.25},
-                {"label":"T", "x":6.5, "y":1.25},
-                {"label":"Y", "x":9.5, "y":1.25},
-                {"label":"U", "x":10.5, "y":1.25},
-                {"label":"I", "x":11.5, "y":1.25},
-                {"label":"O", "x":12.5, "y":1.25},
-                {"label":"P", "x":14, "y":1.25},
-                {"label":"{", "x":15, "y":1.25},
-                {"label":"}", "x":16, "y":1.25},
-                {"label":"|", "x":17, "y":1.25, "w":1.5},
-                {"label":"PgUp", "x":19, "y":1},
-                {"label":"Caps Lock", "x":0.25, "y":2.25, "w":1.75},
-                {"label":"A", "x":2, "y":2.25},
-                {"label":"S", "x":3.75, "y":2.25},
-                {"label":"D", "x":4.75, "y":2.25},
-                {"label":"F", "x":5.75, "y":2.25},
-                {"label":"G", "x":6.75, "y":2.25},
-                {"label":"H", "x":9.75, "y":2.25},
-                {"label":"J", "x":10.75, "y":2.25},
-                {"label":"K", "x":11.75, "y":2.25},
-                {"label":"L", "x":12.75, "y":2.25},
-                {"label":":", "x":14.5, "y":2.25},
-                {"label":"\"", "x":15.5, "y":2.25},
-                {"label":"Enter", "x":16.5, "y":2.25, "w":2.25},
-                {"label":"PgDn", "x":19.25, "y":2},
-                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":4.25, "y":3.25},
-                {"label":"C", "x":5.25, "y":3.25},
-                {"label":"V", "x":6.25, "y":3.25},
-                {"label":"B", "x":7.25, "y":3.25},
-                {"label":"B", "x":9.25, "y":3.25},
-                {"label":"N", "x":10.25, "y":3.25},
-                {"label":"M", "x":11.25, "y":3.25},
-                {"label":"<", "x":12.25, "y":3.25},
-                {"label":">", "x":14, "y":3.25},
-                {"label":"?", "x":15, "y":3.25},
-                {"label":"Shift", "x":16, "y":3.25, "w":1.75},
-                {"label":"\u2191", "x":17.75, "y":3.25},
-                {"label":"Ctrl", "x":0.25, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":4, "y":4.25, "w":1.25},
-                {"label":"Space", "x":5.25, "y":4.25, "w":2.25},
-                {"label":"Layer 2", "x":7.5, "y":4.25},
-                {"label":"Space", "x":9, "y":4.25, "w":2},
-                {"x":11, "y":4.25},
-                {"label":"Right Alt", "x":12, "y":4.25},
-                {"label":"Win", "x":15.25, "y":4.25, "w":1.5},
-                {"label":"\u2190", "x":16.75, "y":4.25},
-                {"label":"\u2193", "x":17.75, "y":4.25},
-                {"label":"\u2192", "x":18.75, "y":4.25}
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 4, "y": 0.25},
+                {"matrix": [0, 4], "x": 5, "y": 0.25},
+                {"matrix": [0, 5], "x": 6, "y": 0.25},
+                {"matrix": [4, 3], "x": 7, "y": 0.25},
+
+                {"matrix": [0, 6], "x": 10, "y": 0.25},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14.25, "y": 0.25},
+                {"matrix": [0, 11], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 13], "x": 16.25, "y": 0.25, "w": 2},
+
+                {"matrix": [0, 14], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+                {"matrix": [1, 11], "x": 15, "y": 1.25},
+                {"matrix": [1, 12], "x": 16, "y": 1.25},
+                {"matrix": [1, 13], "x": 17, "y": 1.25, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 19, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.75, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.5, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 19.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 14, "y": 3.25},
+                {"matrix": [3, 11], "x": 15, "y": 3.25},
+                {"matrix": [3, 12], "x": 16, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 13], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 5], "x": 7.5, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 9, "y": 4.25, "w": 2},
+                {"matrix": [4, 8], "x": 11, "y": 4.25},
+                {"matrix": [4, 9], "x": 12, "y": 4.25},
+                {"matrix": [4, 10], "x": 15.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 11], "x": 16.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 17.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 18.75, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/hineybush/physix/physix.c b/keyboards/hineybush/physix/physix.c
index 99614aeb78..c118b30d2e 100644
--- a/keyboards/hineybush/physix/physix.c
+++ b/keyboards/hineybush/physix/physix.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "physix.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/hineybush/physix/physix.h b/keyboards/hineybush/physix/physix.h
deleted file mode 100644
index c081a53806..0000000000
--- a/keyboards/hineybush/physix/physix.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Copyright 2019 hineybush
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409,       k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_split_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k409,       k410,       k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, k012, k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_275_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,             k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,KC_NO,k409 ,k410, k411, k412, k413, KC_NO}  \
-}
-
-#define LAYOUT_full_bksp_200_rspace( \
-    k000, k001, k002, k003, k004, k005, k403,  k006, k007, k008, k009, k010, k011,       k013, k014, \
-    k100, k101, k102, k103, k104, k105,        k106, k107, k108, k109, k110, k111, k112, k113, k114, \
-    k200, k201, k202, k203, k204, k205,        k206, k207, k208, k209, k210, k211, k212,       k214, \
-    k300, k301, k302, k303, k304, k305,        k306, k307, k308, k309, k310, k311, k312, k313,       \
-    k400,       k402,       k404, k405,        k406,       k408, k409, k410, k411, k412, k413        \
-) \
-{ \
-    {k000, k001, k002, k003, k004, k005,   k006, k007, k008, k009, k010, k011, KC_NO,k013,  k014}, \
-    {k100, k101, k102, k103, k104, k105,   k106, k107, k108, k109, k110, k111, k112, k113,  k114}, \
-    {k200, k201, k202, k203, k204, k205,   k206, k207, k208, k209, k210, k211, k212, KC_NO, k214}, \
-    {k300, k301, k302, k303, k304, k305,   k306, k307, k308, k309, k310, k311, k312, k313, KC_NO}, \
-    {k400, KC_NO,k402, k403, k404, k405,   k406, KC_NO,k408, k409 ,k410, k411, k412, k413, KC_NO}  \
-}
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index 418410c3ff..7f3edd4843 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -21,340 +21,359 @@
     "layouts": {
         "LAYOUT_all": {
             "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": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "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": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "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": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "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": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "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 },
-                { "x": 7.5, "y": 4, "w": 2.5 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+                {"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": [1, 13], "x": 14, "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": [2, 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, "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": [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, 4], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4},
+                {"matrix": [4, 9], "x": 7.5, "y": 4, "w": 2.5},
+                {"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}
             ]
         },
         "LAYOUT_ansi": {
             "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": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "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": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "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": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.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": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.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": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+                {"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": [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": [2, 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, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"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}
             ]
         },
         "LAYOUT_split_space": {
             "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": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "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": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "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": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "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": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 1.5, "y": 4 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "x": 4, "y": 4, "w": 2.75 },
-                { "x": 6.75, "y": 4, "w": 1.5 },
-                { "x": 8.25, "y": 4, "w": 2.75 },
-                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+                {"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": [1, 13], "x": 14, "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": [2, 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, "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": [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.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_tsangan_split_bs": {
             "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": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Bksp", "x": 13, "y": 0 },
-                { "label": "~", "x": 14, "y": 0 },
-                { "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": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Caps Lock", "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": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "Enter", "x": 12.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": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 1.5, "y": 4 },
-                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
-                { "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
-                { "label": "Win", "x": 12.5, "y": 4 },
-                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+                {"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": [1, 13], "x": 14, "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": [2, 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, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_iso": {
-         "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": 7, "y": 0 },
-                { "label": "8", "x": 8, "y": 0 },
-                { "label": "9", "x": 9, "y": 0 },
-                { "label": "0", "x": 10, "y": 0 },
-                { "label": "-", "x": 11, "y": 0 },
-                { "label": "=", "x": 12, "y": 0 },
-                { "label": "Backspace", "x": 13, "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": 6.5, "y": 1 },
-                { "label": "U", "x": 7.5, "y": 1 },
-                { "label": "I", "x": 8.5, "y": 1 },
-                { "label": "O", "x": 9.5, "y": 1 },
-                { "label": "P", "x": 10.5, "y": 1 },
-                { "label": "{", "x": 11.5, "y": 1 },
-                { "label": "}", "x": 12.5, "y": 1 },
-                { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h":2 },
-                { "label": "Caps Lock", "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": 6.75, "y": 2 },
-                { "label": "J", "x": 7.75, "y": 2 },
-                { "label": "K", "x": 8.75, "y": 2 },
-                { "label": "L", "x": 9.75, "y": 2 },
-                { "label": ":", "x": 10.75, "y": 2 },
-                { "label": "\"", "x": 11.75, "y": 2 },
-                { "label": "|", "x": 12.75, "y": 2 },
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "|", "x": 1.25, "y": 3 },
-                { "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": 7.25, "y": 3 },
-                { "label": "M", "x": 8.25, "y": 3 },
-                { "label": "<", "x": 9.25, "y": 3 },
-                { "label": ">", "x": 10.25, "y": 3 },
-                { "label": "?", "x": 11.25, "y": 3 },
-                { "label": "Shift", "x": 12.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": 6.25 },
-                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+            "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": [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": [2, 12], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"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, 13], "x": 12.75, "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, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [3, 13], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "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/jels/jels60/jels60.h b/keyboards/jels/jels60/jels60.h
deleted file mode 100644
index f8bc296e1a..0000000000
--- a/keyboards/jels/jels60/jels60.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  copyright 2022 Joah Nelson (Jels)
-*
-*   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
-*   MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-#define LAYOUT_all( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9, K4x10, K4x11, K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9, K4x10, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_ansi( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13, \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,        \
-    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12,        \
-    K4x0, K4x1, K4x2,             K4x6,                         K4x10, K4x11, K4x12, K4x13  \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, ____ }, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_split_space( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9,        K4x11, K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9,  ____, K4x11, K4x12, K4x13}  \
-}
-
-#define LAYOUT_tsangan_split_bs( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
-    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
-}
-
-#define LAYOUT_iso( \
-    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13,         \
-    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x12,         \
-    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x13,                \
-    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
-    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
-){ \
-    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
-    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
-    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
-    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
-    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
-}
-
-
-
diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json
index c8b0ccd1e8..a93c918479 100644
--- a/keyboards/kb_elmo/qez/info.json
+++ b/keyboards/kb_elmo/qez/info.json
@@ -21,121 +21,130 @@
     "layouts": {
         "LAYOUT_split_space": {
             "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, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.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, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "w":2.25},
-                {"x":5.25, "y":3, "w":2},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"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, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "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, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         },
         "LAYOUT_triple_space": {
             "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, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.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, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3, "w":2.5},
-                {"x":4.5, "y":3, "w":1.5},
-                {"x":6, "y":3, "w":2.25},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"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, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "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, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 2, "y": 3, "w": 2.5},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         },
         "LAYOUT_full_space": {
             "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, "w":1.25},
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.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, "w":1.5},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3, "w":6.25},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3}
+                {"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, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "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, "w": 1.5},
+
+                {"matrix": [2, 1], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 5], "x": 2, "y": 3, "w": 6.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kb_elmo/qez/qez.h b/keyboards/kb_elmo/qez/qez.h
deleted file mode 100644
index 0a3e2c0a7e..0000000000
--- a/keyboards/kb_elmo/qez/qez.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2021 kb-elmo<mail@elmo.space>
- *
- * 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 ___ KC_NO
-
-#define LAYOUT_split_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31, k32,    k33,     k36,    k37, k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, k32, k33, ___, ___, k36, k37, k38, k39 }  \
-}
-
-#define LAYOUT_triple_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31,     k33,     k35,    k36,     k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, ___, k33, ___, k35, k36, ___, k38, k39 }  \
-}
-
-#define LAYOUT_full_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
-    k20,    k22, k23, k24, k25, k26, k27, k28,   k29, \
-    k21, k31,              k35,             k38, k39  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { ___, k31, ___, ___, ___, k35, ___, ___, k38, k39 }  \
-}
diff --git a/keyboards/kingly_keys/little_foot/info.json b/keyboards/kingly_keys/little_foot/info.json
index 3b23bead52..c3cde9243f 100644
--- a/keyboards/kingly_keys/little_foot/info.json
+++ b/keyboards/kingly_keys/little_foot/info.json
@@ -20,10 +20,105 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT_split_space_base": {
-      "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":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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":1.5}, {"x":3, "y":4, "w":2}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":1.5}]
+      "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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 5], "x": 3, "y": 4, "w": 2},
+        {"matrix": [4, 6], "x": 5, "y": 4, "w": 2},
+        {"matrix": [4, 8], "x": 7, "y": 4, "w": 1.5}
+      ]
     },
     "LAYOUT_big_space_base": {
-      "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":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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":1.5, "y":4, "w":7}]
+      "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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+
+        {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 7}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/little_foot/little_foot.h b/keyboards/kingly_keys/little_foot/little_foot.h
deleted file mode 100644
index 860eaeb8f0..0000000000
--- a/keyboards/kingly_keys/little_foot/little_foot.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_split_space_base( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \
-         k42,        k46,      k47,         k49        \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \
-    { XXX, k42, XXX, XXX, XXX, k46, k47, XXX, k49, XXX  }  \
-}
-
-#define LAYOUT_big_space_base( \
-    k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, \
-    k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, \
-    k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, \
-    k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, \
-                           k46                         \
-) \
-{ \
-    { k01, k02, k03, k04, k05, k06, k07, k08, k09, k010 }, \
-    { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110 }, \
-    { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210 }, \
-    { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310 }, \
-    { XXX, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX  }  \
-}
diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/info.json
index f04ac95151..7c1fa4883e 100755
--- a/keyboards/lazydesigners/the60/rev1/info.json
+++ b/keyboards/lazydesigners/the60/rev1/info.json
@@ -22,72 +22,77 @@
     "layouts": {
         "LAYOUT_split_spc_split_bspc": {
             "layout": [
-              {"label":"~", "x":0, "y":0},
-              {"label":"!", "x":1, "y":0},
-              {"label":"@", "x":2, "y":0},
-              {"label":"#", "x":3, "y":0},
-              {"label":"$", "x":4, "y":0},
-              {"label":"%", "x":5, "y":0},
-              {"label":"^", "x":6, "y":0},
-              {"label":"&", "x":7, "y":0},
-              {"label":"*", "x":8, "y":0},
-              {"label":"(", "x":9, "y":0},
-              {"label":")", "x":10, "y":0},
-              {"label":"_", "x":11, "y":0},
-              {"label":"+", "x":12, "y":0},
-              {"label":"Home", "x":13, "y":0},
-              {"label":"Del", "x":14, "y":0},
-              {"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":6.5, "y":1},
-              {"label":"U", "x":7.5, "y":1},
-              {"label":"I", "x":8.5, "y":1},
-              {"label":"O", "x":9.5, "y":1},
-              {"label":"P", "x":10.5, "y":1},
-              {"label":"|", "x":11.5, "y":1, "w":1.5},
-              {"label":"}", "x":13, "y":1},
-              {"label":"{", "x":14, "y":1},
-              {"label":"Caps Lock", "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":6.75, "y":2},
-              {"label":"J", "x":7.75, "y":2},
-              {"label":"K", "x":8.75, "y":2},
-              {"label":"L", "x":9.75, "y":2},
-              {"label":"Enter", "x":10.75, "y":2, "w":2.25},
-              {"label":":", "x":13, "y":2},
-              {"label":"\"", "x":14, "y":2},
-              {"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":7.25, "y":3},
-              {"label":"M", "x":8.25, "y":3},
-              {"label":"<", "x":9.25, "y":3},
-              {"label":">", "x":10.25, "y":3},
-              {"label":"Shift", "x":11.25, "y":3, "w":1.75},
-              {"label":"Up", "x":13, "y":3},
-              {"label":"/", "x":14, "y":3},
-              {"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.25},
-              {"x":6, "y":4, "w":2.75},
-              {"label":"Alt", "x":8.75, "y":4, "w":1.25},
-              {"label":"Menu", "x":10, "y":4},
-              {"label":"Fn", "x":11, "y":4},
-              {"label":"Left", "x":12, "y":4},
-              {"label":"Down", "x":13, "y":4},
-              {"label":"Right", "x":14, "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": [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": [0, 14], "x": 14, "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, "w": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "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, "w": 2.25},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 6, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 8.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/lazydesigners/the60/rev1/rev1.h b/keyboards/lazydesigners/the60/rev1/rev1.h
deleted file mode 100755
index e3708461c4..0000000000
--- a/keyboards/lazydesigners/the60/rev1/rev1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-/*
- *  ,--------------------------------------------------------------------------.
- *  |    |    |    |    |    |    |    |    |    |    |    |    |    |    |    |
- *  |--------------------------------------------------------------------------|
- *  |       |    |    |    |    |    |    |    |    |    |    |      |    |    |
- *  |--------------------------------------------------------------------------|
- *  |         |    |    |    |    |    |    |    |    |    |         |    |    |
- *  |--------------------------------------------------------------------------|
- *  |           |    |    |    |    |    |    |    |    |    |       |    |    |
- *  |--------------------------------------------------------------------------|
- *  |      |      |      |         |           |      |    |    |    |    |    |
- *  `--------------------------------------------------------------------------'
- */
-
-#define LAYOUT_split_spc_split_bspc( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-  K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-  K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
-  K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
-  K400,       K402, K403, K404,             K407,       K409, K410, K411, K412, K413, K414  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-  { K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-  { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \
-  { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO }, \
-  { K400,  KC_NO, K402,  K403,  K404,  KC_NO, KC_NO, K407,  KC_NO, K409,  K410,  K411,  K412,  K413,  K414 }  \
-}
-
diff --git a/keyboards/matthewdias/model_v/info.json b/keyboards/matthewdias/model_v/info.json
index eee9c69b3d..f3fa150d57 100644
--- a/keyboards/matthewdias/model_v/info.json
+++ b/keyboards/matthewdias/model_v/info.json
@@ -17,147 +17,156 @@
     "layouts": {
         "LAYOUT_split": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "Raise", "x": 3.5, "y": 3 },
-                { "x": 4.5, "y": 3, "w": 2.25 },
-                { "x": 6.75, "y": 3, "w": 2 },
-                { "label": "Lower", "x": 8.75, "y": 3 },
-                { "label": "Meta", "x": 9.75, "y": 3 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"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, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "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": [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, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_2x3u": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "x": 3.5, "y": 3, "w": 3 },
-                { "x": 6.5, "y": 3, "w": 3 },
-                { "label": "Meta", "x": 9.5, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"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, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "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": [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, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_bigbar": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 3 },
-                { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
-                { "x": 3.5, "y": 3, "w": 6.25 },
-                { "label": "Meta", "x": 9.75, "y": 3 },
-                { "label": "Alt", "x": 10.75, "y": 3 },
-                { "label": "Ctrl", "x": 11.75, "y": 3 }
+                {"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, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "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": [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, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 6.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/matthewdias/model_v/model_v.h b/keyboards/matthewdias/model_v/model_v.h
deleted file mode 100644
index 6f3a96080e..0000000000
--- a/keyboards/matthewdias/model_v/model_v.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.com>
-
-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_split( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33,      K35,      K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, K3B }  \
-}
-
-#define LAYOUT_2x3u( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K35,      K37,      K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, XXX, K35, XXX, K37, XXX, K39, K3A, K3B }  \
-}
-
-#define LAYOUT_bigbar( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32,           K35,                K39, K3A, K3B  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-    { K30, K31, K32, XXX, XXX, K35, XXX, XXX, XXX, K39, K3A, K3B }  \
-}
diff --git a/keyboards/mechlovin/hex4b/hex4b.h b/keyboards/mechlovin/hex4b/hex4b.h
deleted file mode 100644
index 17e2da910f..0000000000
--- a/keyboards/mechlovin/hex4b/hex4b.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * 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
-
-/*
- * ┌───┠┌───┬───┬───┬───┠┌───┬───┬───┬───┠┌───┬───┬───┬───┠┌───â”
- * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │
- * ├───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┼───┼───┼───┼─┴─┬─┴─┬─┴─┬─┴─┬─┴─┼───┤   ┌───────â”
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3C │1E │   │1D     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤   └───────┘
- * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │2E │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
- * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │3E │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
- * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4D │4E │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───────┼───┤
- * │50  │51  │52  │56                      │5A  │5B  │ │5C │5D │5E │
- * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────â”
- * │50   │51 │52   │56                         │5B   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_split_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E,      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E       \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_2u_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_tsangan_split_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E,      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3C, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E,      \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E       \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
-}
-
-#define LAYOUT_tsangan_2u_bs( \
-    K00, K01, K02, K03, K04,    K06, K07, K08, K09,   K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,      K3E, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
-    K50, K51, K52,                K56,                     K5B, K5C, K5D, K5E  \
-) { \
-    { K00, K01, K02, K03, K04, XXX, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
-    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E }, \
-}
diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json
index 3cc4645584..9964736255 100644
--- a/keyboards/mechlovin/hex4b/info.json
+++ b/keyboards/mechlovin/hex4b/info.json
@@ -16,362 +16,382 @@
     "layouts": {
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1},
-                {"label":"K3C (B3,D2)", "x":14, "y":1},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
-                {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 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.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [3, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_2u_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.25},
-                {"label":"K51 (B5,B7)", "x":1.25, "y":5, "w":1.25},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.25},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5, "w":6.25},
-                {"label":"K5A (B5,D0)", "x":10, "y":5, "w":1.25},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5, "w":1.25},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 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.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_tsangan_split_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1},
-                {"label":"K3C (B3,D2)", "x":14, "y":1},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
-                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
-                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
-                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 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.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [3, 12], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_tsangan_2u_bs": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.5, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.5, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.5, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6, "y":0},
-                {"label":"K07 (B0,C5)", "x":7, "y":0},
-                {"label":"K08 (B0,C6)", "x":8, "y":0},
-                {"label":"K09 (B0,C7)", "x":9, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.5, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.5, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.5, "y":0},
-                {"label":"K0D (B0,D3)", "x":13.5, "y":0},
-                {"label":"K0E (B0,D4)", "x":15, "y":0},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,D3)", "x":13, "y":1, "w":2},
-                {"label":"K1E (B1,D4)", "x":15, "y":1},
-
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K2E (B2,D4)", "x":15, "y":2},
-
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,D3)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K3E (B3,D4)", "x":15, "y":3},
-
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4D (B4,D3)", "x":14, "y":4},
-                {"label":"K4E (B4,D4)", "x":15, "y":4},
-
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
-                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
-                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
-                {"label":"K5B (B5,D1)", "x":11, "y":5, "w":1.5},
-                {"label":"K5C (B5,D2)", "x":13, "y":5},
-                {"label":"K5D (B5,D3)", "x":14, "y":5},
-                {"label":"K5E (B5,D4)", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 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.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json
index 712b3096f4..81893874e0 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/info.json
@@ -27,7 +27,100 @@
     },
     "layouts": {
         "LAYOUT_split_bs": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1, "y":1}, {"label":"1,2", "x":2, "y":1}, {"label":"1,3", "x":3, "y":1}, {"label":"1,4", "x":4, "y":1}, {"label":"1,5", "x":5, "y":1}, {"label":"1,6", "x":6, "y":1}, {"label":"1,7", "x":7, "y":1}, {"label":"1,8", "x":8, "y":1}, {"label":"1,9", "x":9, "y":1}, {"label":"1,10", "x":10, "y":1}, {"label":"1,11", "x":11, "y":1}, {"label":"1,12", "x":12, "y":1}, {"label":"1,13", "x":13, "y":1}, {"label":"1,14", "x":14, "y":1}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.5}, {"label":"2,1", "x":1.5, "y":2}, {"label":"2,2", "x":2.5, "y":2}, {"label":"2,3", "x":3.5, "y":2}, {"label":"2,4", "x":4.5, "y":2}, {"label":"2,5", "x":5.5, "y":2}, {"label":"2,6", "x":6.5, "y":2}, {"label":"2,7", "x":7.5, "y":2}, {"label":"2,8", "x":8.5, "y":2}, {"label":"2,9", "x":9.5, "y":2}, {"label":"2,10", "x":10.5, "y":2}, {"label":"2,11", "x":11.5, "y":2}, {"label":"2,12", "x":12.5, "y":2}, {"label":"2,14", "x":13.5, "y":2, "w":1.5}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.75}, {"label":"3,1", "x":1.75, "y":3}, {"label":"3,2", "x":2.75, "y":3}, {"label":"3,3", "x":3.75, "y":3}, {"label":"3,4", "x":4.75, "y":3}, {"label":"3,5", "x":5.75, "y":3}, {"label":"3,6", "x":6.75, "y":3}, {"label":"3,7", "x":7.75, "y":3}, {"label":"3,8", "x":8.75, "y":3}, {"label":"3,9", "x":9.75, "y":3}, {"label":"3,10", "x":10.75, "y":3}, {"label":"3,11", "x":11.75, "y":3}, {"label":"3,12", "x":12.75, "y":3}, {"label":"3,13", "x":13.75, "y":3, "w":1.25}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4}, {"label":"4,2", "x":2.25, "y":4}, {"label":"4,3", "x":3.25, "y":4}, {"label":"4,4", "x":4.25, "y":4}, {"label":"4,5", "x":5.25, "y":4}, {"label":"4,6", "x":6.25, "y":4}, {"label":"4,7", "x":7.25, "y":4}, {"label":"4,8", "x":8.25, "y":4}, {"label":"4,9", "x":9.25, "y":4}, {"label":"4,10", "x":10.25, "y":4}, {"label":"4,11", "x":11.25, "y":4}, {"label":"4,12", "x":12.25, "y":4, "w":1.75}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}, {"label":"5,0", "x":0, "y":5, "w":1.25}, {"label":"5,1", "x":1.25, "y":5, "w":1.25}, {"label":"5,2", "x":2.5, "y":5, "w":1.25}, {"label":"5,6", "x":3.75, "y":5, "w":6.25}, {"label":"5,10", "x":10, "y":5}, {"label":"5,11", "x":11, "y":5}, {"label":"5,12", "x":12, "y":5}, {"label":"5,13", "x":13, "y":5}, {"label":"5,14", "x":14, "y":5}, {"label":"5,15", "x":15, "y":5}]
+            "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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13, "y": 5},
+                {"matrix": [5, 14], "x": 14, "y": 5},
+                {"matrix": [5, 15], "x": 15, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index 9f70c76638..41f9dbb438 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "octagon.h"
+#include "quantum.h"
 
 const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
diff --git a/keyboards/mechlovin/olly/octagon/octagon.h b/keyboards/mechlovin/olly/octagon/octagon.h
deleted file mode 100644
index d63b345720..0000000000
--- a/keyboards/mechlovin/olly/octagon/octagon.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2022 Team Mechlovin
- *
- * 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_split_bs( \
-    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,      K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
-    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F  \
-) { \
-    { 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, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, K3F }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E, K4F }, \
-    { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E, K5F }, \
-}
diff --git a/keyboards/mnk50/info.json b/keyboards/mnk50/info.json
index 882dfad7d3..3d4c98edc7 100755
--- a/keyboards/mnk50/info.json
+++ b/keyboards/mnk50/info.json
@@ -18,165 +18,165 @@
     "layouts": {
         "LAYOUT_all": {
             "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},
+                {"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},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"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, "w":1.25},
-                {"x":13, "y":2},
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3, "w":2},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3, "w":2},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_split_space": {
             "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},
+                {"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},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"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, "w":1.25},
-                {"x":13, "y":2},
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3, "w":2.25},
-                {"x":6.75, "y":3, "w":2.75},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         },
         "LAYOUT_7u_space": {
             "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},
+                {"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},
 
-                {"x":0, "y":1, "w":1.25},
-                {"x":1.25, "y":1},
-                {"x":2.25, "y":1},
-                {"x":3.25, "y":1},
-                {"x":4.25, "y":1},
-                {"x":5.25, "y":1},
-                {"x":6.25, "y":1},
-                {"x":7.25, "y":1},
-                {"x":8.25, "y":1},
-                {"x":9.25, "y":1},
-                {"x":10.25, "y":1},
-                {"x":11.25, "y":1},
-                {"x":12.25, "y":1, "w":1.75},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "x": 11.25, "y": 1},
+                {"matrix": [1, 13], "x": 12.25, "y": 1, "w": 1.75},
 
-                {"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, "w":1.25},
-                {"x":13, "y":2},
+                {"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, "w": 1.25},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3, "w":1.25},
-                {"x":3.5, "y":3, "w":7},
-                {"x":10.5, "y":3, "w":1.25},
-                {"x":11.75, "y":3}
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 7},
+                {"matrix": [3, 10], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/mnk50/mnk50.h b/keyboards/mnk50/mnk50.h
deleted file mode 100644
index 5944450387..0000000000
--- a/keyboards/mnk50/mnk50.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * 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
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-/*
- *   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───â”
- *   │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
- *   ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
- *   │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D    │
- *   ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤   ┌────────â”
- *   │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B  │2D │   │2B      │ 2.25u RShift
- *   └────┬─┴─┬─┴──┬┴──┬┴───┴───┼───┴───┴──┬┴──┬┴───┼───┬┴───┘   └────────┘
- *        │31 │32  │33 │   35   │    37    │39 │3A  │3B │
- *        └───┴────┴───┴────────┴──────────┴───┴────┴───┘
- *                 ┌───────────────────────────â”
- *                 │            36             │ 7u Spacebar
- *                 └───────────────────────────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35, K36, K37,      K39, K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, K36, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_split_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32, K33,      K35,      K37,      K39, K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, K33, XXX, K35, XXX, K37, XXX, K39, K3A, K3B, XXX, XXX }  \
-}
-
-#define LAYOUT_7u_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,      K1D, \
-    K20,      K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
-         K31, K32,                K36,                K3A, K3B            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, XXX, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { XXX, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, XXX, XXX }  \
-}
diff --git a/keyboards/pearl/info.json b/keyboards/pearl/info.json
index c31a47749f..8ac8ef0a7e 100644
--- a/keyboards/pearl/info.json
+++ b/keyboards/pearl/info.json
@@ -27,16 +27,156 @@
   "bootloader": "bootloadhid",
   "layouts": {
     "LAYOUT_all": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"Backspace", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"\\", "x":11.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Alt", "x":1.13, "y":3}, {"label":"Ctrl", "x":2.13, "y":3, "w":1.25}, {"label":"Win", "x":3.375, "y":3, "w":1.25}, {"label":"Shift", "x":4.625, "y":3, "w":2.25}, {"x":6.875, "y":3, "w":1.25}, {"x":8.125, "y":3, "w":1.5}, {"label":"Menu", "x":9.625, "y":3}, {"label":"Fn", "x":10.63, "y":3, "w":1.25}]
-    },
+      "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},
 
-    "LAYOUT_splits": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Win", "x":2, "y":3, "w":1.25}, {"label":"Alt", "x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2.25}, {"label":"Alt", "x":6.75, "y":3, "w":2.75}, {"label":"Win", "x":9.5, "y":3, "w":1.25}, {"label":"Menu", "x":10.75, "y":3}]
+        {"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, "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, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1.13, "y": 3},
+        {"matrix": [3, 1], "x": 2.13, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.375, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 4.625, "y": 3, "w": 2.25},
+        {"matrix": [3, 5], "x": 6.875, "y": 3, "w": 1.25},
+        {"matrix": [3, 7], "x": 8.125, "y": 3, "w": 1.5},
+        {"matrix": [3, 9], "x": 9.625, "y": 3},
+        {"matrix": [3, 10], "x": 10.63, "y": 3, "w": 1.25}
+      ]
     },
+    "LAYOUT_splits": {
+      "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": [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, "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, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25},
+        {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3}
+      ]
+    },
     "LAYOUT_spacebar": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":":", "x":10.5, "y":1}, {"label":"Enter", "x":11.5, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Win", "x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":6.25}, {"label":"Win", "x":9.5, "y":3, "w":1.25}, {"label":"Menu", "x":10.75, "y":3}]
-    }
+      "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": [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, "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, "w": 1.25},
+
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 3.25, "y": 3, "w": 6.25},
+        {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+        {"matrix": [3, 10], "x": 10.75, "y": 3}
+      ]
+    }
   }
 }
diff --git a/keyboards/pearl/pearl.h b/keyboards/pearl/pearl.h
deleted file mode 100644
index 72df1595de..0000000000
--- a/keyboards/pearl/pearl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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"
-#include "pearl.h"
-
-#define LAYOUT_all( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-       K30, K31, K32,   K34,  K35, K37,   K39, K3A\
-){ \
-  { K00, K01, K02, K03,   K04, K05, K06,   K07, K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12, K13,   K14, K15, K16,   K17, K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22, K23,   K24, K25, K26,   K27, K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, K32, KC_NO, K34, K35, KC_NO, K37, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
-
-#define LAYOUT_splits( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-       K30, K31, K32,   K34,   K37,   K39, K3A\
-){ \
-  { K00, K01, K02, K03,   K04, K05, K06,   K07, K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12, K13,   K14, K15, K16,   K17, K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22, K23,   K24, K25, K26,   K27, K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, K32, KC_NO, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
-
-#define LAYOUT_spacebar( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,\
-   K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,  K1B, \
-    K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,\
-           K30, K31,              K35,           K39, K3A\
-){ \
-  { K00, K01, K02,   K03,   K04, K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C}, \
-  { K10, K11, K12,   K13,   K14, K15, K16,   K17,   K18,   K19, K1A, K1B,   KC_NO}, \
-  { K20, K21, K22,   K23,   K24, K25, K26,   K27,   K28,   K29, K2A, K2B,   KC_NO}, \
-  { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39, K3A, KC_NO, KC_NO}, \
-}
diff --git a/keyboards/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json
index 5dc3d0ef71..e5192d6c49 100644
--- a/keyboards/primekb/meridian/info.json
+++ b/keyboards/primekb/meridian/info.json
@@ -17,10 +17,158 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT_unified_bs_rshift": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "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":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "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": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "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": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "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": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 2.75},
+
+                {"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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         },
         "LAYOUT_split_bs_rshift": {
-            "layout":[{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Del", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0}, {"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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+            "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": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+
+                {"matrix": [2, 12], "x": 15.5, "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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "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": 8.25, "y": 2},
+                {"matrix": [2, 7], "x": 9.25, "y": 2},
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "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.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.5, "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": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
diff --git a/keyboards/primekb/meridian/meridian.c b/keyboards/primekb/meridian/meridian.c
index 8d94faf9ea..c2f740dd14 100644
--- a/keyboards/primekb/meridian/meridian.c
+++ b/keyboards/primekb/meridian/meridian.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "meridian.h"
+#include "quantum.h"
 
 //Initialize B12 for in-switch caps lock
 void keyboard_pre_init_kb(void){
diff --git a/keyboards/primekb/meridian/meridian.h b/keyboards/primekb/meridian/meridian.h
deleted file mode 100644
index e6a155ddec..0000000000
--- a/keyboards/primekb/meridian/meridian.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright 2020 Holten Campbell
-
-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 K_NO KC_NO
-
-#define LAYOUT_unified_bs_rshift( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,             K312, \
-	K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K_NO}, \
-	{ K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
-
-#define LAYOUT_split_bs_rshift( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313, \
-	K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
-) \
-{ \
-	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-	{ K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
-}
diff --git a/keyboards/projectcain/relic/info.json b/keyboards/projectcain/relic/info.json
index c7441bd1a6..2e4fcd6dbd 100644
--- a/keyboards/projectcain/relic/info.json
+++ b/keyboards/projectcain/relic/info.json
@@ -22,16 +22,196 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"LGUI", "x":3, "y":3.25}, {"label":"BACK <BR> SPACE", "x":4, "y":3.25, "w":1.5}, {"label":"Space", "x":5.5, "y":3.25}, {"label":"Space", "x":6.5, "y":3.25, "w":1.5}, {"label":"RGUI", "x":8, "y":3.25}]
-       },    
+            "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": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3, "y": 3.25},
+                {"matrix": [3, 6], "x": 4, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 7], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 6.5, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 9], "x": 8, "y": 3.25}
+            ]
+        },
         "LAYOUT_full_space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"Space", "x":3, "y":3.25, "w":6}]
-       },
-       "LAYOUT_split_2space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"BACK <BR> SPACE", "x":3, "y":3.25, "w":3}, {"label":"Space", "x":6, "y":3.25, "w":3}]
-       },
-       "LAYOUT_split_4space": {
-            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"BACK <BR> SPACE", "x":11, "y":0}, {"label":"A", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":";", "x":10.25, "y":1, "w":1.75}, {"label":"Z", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"/", "x":10.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0.25, "y":3, "w":1.25}, {"label":"Alt", "x":1.5, "y":3, "w":1.25}, {"label":"MO(1)", "x":9.25, "y":3, "w":1.25}, {"label":"MO(2)", "x":10.5, "y":3, "w":1.25}, {"label":"Lgui", "x":3, "y":3.25}, {"label":"BACK <BR> SPACE", "x":4, "y":3.25, "w":2}, {"label":"Space", "x":6, "y":3.25, "w":2}, {"label":"Rgui", "x":8, "y":3.25}]
+            "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": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 3, "y": 3.25, "w": 6}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "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": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 3, "y": 3.25, "w": 3},
+                {"matrix": [3, 9], "x": 6, "y": 3.25, "w": 3}
+            ]
+        },
+        "LAYOUT_split_4space": {
+            "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": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3, "y": 3.25},
+                {"matrix": [3, 7], "x": 4, "y": 3.25, "w": 2},
+                {"matrix": [3, 8], "x": 6, "y": 3.25, "w": 2},
+                {"matrix": [3, 9], "x": 8, "y": 3.25}
+            ]
         }
     }
 }
diff --git a/keyboards/projectcain/relic/relic.c b/keyboards/projectcain/relic/relic.c
index f72250847d..673ca8586c 100644
--- a/keyboards/projectcain/relic/relic.c
+++ b/keyboards/projectcain/relic/relic.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "relic.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/projectcain/relic/relic.h b/keyboards/projectcain/relic/relic.h
deleted file mode 100644
index 45ae28a97f..0000000000
--- a/keyboards/projectcain/relic/relic.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-   K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-   K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-   K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-   K300, K301,       K303, K304, K305, K306, K307, K308, K309  \
-) \
- { \
-   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-   { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-   { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-   { K300,  K301,  KC_NO, K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,                   K305,             K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, KC_NO, KC_NO, K305,  KC_NO, KC_NO, K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,             K304,       K306,       K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  KC_NO }  \
-}
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-    K300, K301,       K303, K304,       K306, K307, K308, K309  \
-) \
- { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { K300,  K301,  KC_NO, K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO }  \
-}
diff --git a/keyboards/projectcain/vault35/info.json b/keyboards/projectcain/vault35/info.json
index 3bda8233e7..0a8e9ebad2 100644
--- a/keyboards/projectcain/vault35/info.json
+++ b/keyboards/projectcain/vault35/info.json
@@ -21,20 +21,175 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
-    "LAYOUT_split_4space": {
-   "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"label":"LOWER", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1.75}, {"label":"RAISE", "x":7.25, "y":3, "w":1.25}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+        "LAYOUT_split_4space": {
+            "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},
 
-    "LAYOUT_split_3space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":2.25}, {"label":"FN", "x":4.75, "y":3}, {"x":5.75, "y":3, "w":2.75}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
 
-    "LAYOUT_split_2space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":3}, {"x":5.5, "y":3, "w":3}, {"label":"ALT", "x":8.5, "y":3}]
-    },
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_split_3space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        },
+        "LAYOUT_full_space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
 
-    "LAYOUT_full_space": {
-      "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"BACK<br>SPACE", "x":10, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":"ENTER", "x":9.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"X", "x":1.75, "y":2}, {"label":"C", "x":2.75, "y":2}, {"label":"V", "x":3.75, "y":2}, {"label":"B", "x":4.75, "y":2}, {"label":"N", "x":5.75, "y":2}, {"label":"M", "x":6.75, "y":2}, {"label":"<", "x":7.75, "y":2}, {"label":">", "x":8.75, "y":2}, {"label":"SHIFT", "x":9.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.5, "y":3}, {"x":2.5, "y":3, "w":6}, {"label":"ALT", "x":8.5, "y":3}]
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 6},
+                {"matrix": [3, 7], "x": 8.5, "y": 3}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/projectcain/vault35/vault35.c b/keyboards/projectcain/vault35/vault35.c
index 2bb1675a1f..14aac7fdf7 100644
--- a/keyboards/projectcain/vault35/vault35.c
+++ b/keyboards/projectcain/vault35/vault35.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vault35.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/projectcain/vault35/vault35.h b/keyboards/projectcain/vault35/vault35.h
deleted file mode 100644
index af5577f314..0000000000
--- a/keyboards/projectcain/vault35/vault35.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301, K302, K303,       K305, K306, K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  K302,  K303,  KC_NO, K305,  K306,  K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_split_3space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,       K303, K304, K305,       K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, K303,  K304,  K305,  KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,       K303,       K305,       K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, K303,  KC_NO, K305,  KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       \
-          K301,             K304,             K307  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO }, \
-    { KC_NO, K301,  KC_NO, KC_NO, K304,  KC_NO, KC_NO, K307,  KC_NO, KC_NO, KC_NO }  \
-} 
diff --git a/keyboards/projectcain/vault45/info.json b/keyboards/projectcain/vault45/info.json
index 4a2327d4fd..9695631cc9 100644
--- a/keyboards/projectcain/vault45/info.json
+++ b/keyboards/projectcain/vault45/info.json
@@ -25,24 +25,260 @@
         "LAYOUT": "LAYOUT_all"
     },
     "layouts": {
-    "LAYOUT_all": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"label":"SYS", "x":3.5, "y":3, "w":1.25}, {"x":4.75, "y":3, "w":1.25}, {"x":6, "y":3}, {"x":7, "y":3, "w":1.25}, {"label":"FN", "x":8.25, "y":3, "w":1.25}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+        "LAYOUT_all": {
+            "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},
 
-    "LAYOUT_split_4space": {
-   "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"label":"SYS", "x":3.5, "y":3, "w":1.25}, {"x":4.75, "y":3, "w":1.75}, {"x":6.5, "y":3, "w":1.75}, {"label":"FN", "x":8.25, "y":3, "w":1.25}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
 
-    "LAYOUT_split_3space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":2.25}, {"x":5.75, "y":3}, {"x":6.75, "y":3, "w":2.75}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"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, "w": 1.25},
 
-    "LAYOUT_split_2space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":3}, {"x":6.5, "y":3, "w":3}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
-    },
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3, "w": 1.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_4space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_3space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_split_2space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 3.5, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.5, "y": 3, "w": 3},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        },
+        "LAYOUT_full_space": {
+            "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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75},
+
+                {"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, "w": 1.25},
 
-    "LAYOUT_full_space": {
-      "layout": [{"label":"ESC", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"DEL", "x":11, "y":0}, {"label":"BACK<br>SPACE", "x":12, "y":0}, {"label":"TAB", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"ENTER", "x":11.25, "y":1, "w":1.75}, {"label":"SHIFT", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"label":"SHIFT", "x":11.75, "y":2, "w":1.25}, {"label":"CTRL", "x":1.25, "y":3}, {"label":"ALT", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":6}, {"label":"ALT", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3}]
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6},
+                {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/projectcain/vault45/vault45.c b/keyboards/projectcain/vault45/vault45.c
index fa82335492..05908ba9d7 100644
--- a/keyboards/projectcain/vault45/vault45.c
+++ b/keyboards/projectcain/vault45/vault45.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "vault45.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/projectcain/vault45/vault45.h b/keyboards/projectcain/vault45/vault45.h
deleted file mode 100644
index b1217d6d06..0000000000
--- a/keyboards/projectcain/vault45/vault45.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2021 projectcain
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,       K304, K305, K306, K307, K308,       K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, K304,  K305,  K306,  K307,  K308,  KC_NO, K310,  K311,  KC_NO }  \
-}
-
-#define LAYOUT_split_4space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,       K304, K305,       K307, K308,       K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, K304,  K305,  KC_NO, K307,  K308,  KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_split_3space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,             K305, K306, K307,             K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, K305,  K306,  K307,  KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_split_2space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,             K305,       K307,             K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, K305,  KC_NO, K307,  KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
-#define LAYOUT_full_space( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110,       K112, \
-    K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-          K301, K302,                   K306,                   K310, K311  \
-) \
-{ \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  KC_NO, K112 }, \
-    { K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-    { KC_NO, K301,  K302,  KC_NO, KC_NO, KC_NO, K306,  KC_NO, KC_NO, KC_NO, K310,  K311,  KC_NO }  \
-}
diff --git a/keyboards/sanctified/dystopia/dystopia.h b/keyboards/sanctified/dystopia/dystopia.h
deleted file mode 100644
index 6f82093126..0000000000
--- a/keyboards/sanctified/dystopia/dystopia.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Quentin Melis
- *
- * 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 ___ KC_NO
-
-#define LAYOUT_split_bs( \
-    K00, K01, K11, K02, K03, K04, K05,        K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K21, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K3D, \
-    K20, K31, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,      K4D, \
-    K30,      K41, K32, K33, K34, K35,        K36, K37, K47, K38, K39, K3A, K3B, K3C,      \
-    K40,      K42,           K44, K45,        K46,           K48, K49,      K4A, K4B, K4C  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, K41, K42, ___, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D } \
-}
diff --git a/keyboards/sanctified/dystopia/info.json b/keyboards/sanctified/dystopia/info.json
index c71f327f6a..1c6fa25e0c 100644
--- a/keyboards/sanctified/dystopia/info.json
+++ b/keyboards/sanctified/dystopia/info.json
@@ -18,11 +18,88 @@
     "layouts": {
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.25, "y":0}, {"label":"*", "x":9.25, "y":0}, {"label":"(", "x":10.25, "y":0}, {"label":")", "x":11.25, "y":0}, {"label":"_", "x":12.25, "y":0}, {"label":"+", "x":13.25, "y":0}, {"label":"~", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Insert", "x":16.5, "y":0}, 
-                {"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.75, "y":1}, {"label":"U", "x":8.75, "y":1}, {"label":"I", "x":9.75, "y":1}, {"label":"O", "x":10.75, "y":1}, {"label":"P", "x":11.75, "y":1}, {"label":"{", "x":12.75, "y":1}, {"label":"}", "x":13.75, "y":1}, {"label":"Delete", "x":14.75, "y":1, "w":1.5}, {"label":"PgUp", "x":16.5, "y":1}, 
-                {"label":"Caps", "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":8, "y":2}, {"label":"J", "x":9, "y":2}, {"label":"K", "x":10, "y":2}, {"label":"L", "x":11, "y":2}, {"label":":", "x":12, "y":2}, {"label":"\"", "x":13, "y":2}, {"label":"Enter", "x":14, "y":2, "w":2.25}, {"label":"PgDn", "x":16.5, "y":2}, 
-                {"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":"B", "x":7.5, "y":3}, {"label":"N", "x":8.5, "y":3}, {"label":"M", "x":9.5, "y":3}, {"label":"<", "x":10.5, "y":3}, {"label":">", "x":11.5, "y":3}, {"label":"?", "x":12.5, "y":3}, {"label":"Shift", "x":13.5, "y":3, "w":1.75}, {"label":"Up", "x":15.25, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"Space", "x":4, "y":4, "w":2.25}, {"label":"Fn", "x":6.25, "y":4}, {"label":"Backspace", "x":7.5, "y":4, "w":2.75}, {"label":"Alt", "x":10.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.75, "y":4, "w":1.5}, {"label":"Left", "x":14.25, "y":4}, {"label":"Down", "x":15.25, "y":4}, {"label":"Right", "x":16.25, "y":4}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [1, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0},
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+
+                {"matrix": [2, 13], "x": 16.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [2, 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": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [1, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 16.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 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": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2, "w": 2.25},
+
+                {"matrix": [4, 13], "x": 16.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [4, 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.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [4, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 15.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4},
+
+                {"matrix": [4, 6], "x": 7.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 14.25, "y": 4},
+                {"matrix": [4, 11], "x": 15.25, "y": 4},
+                {"matrix": [4, 12], "x": 16.25, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
index 944516fecd..0e68b6aedd 100644
--- a/keyboards/skergo/info.json
+++ b/keyboards/skergo/info.json
@@ -21,153 +21,173 @@
     "layouts": {
         "LAYOUT_2u_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0.25},
-                {"label":"1!", "x":1.5, "y":0.25},
-                {"label":"2@", "x":2.5, "y":0.25},
-                {"label":"3#", "x":3.5, "y":0.25},
-                {"label":"4$", "x":4.5, "y":0.25},
-                {"label":"5%", "x":5.5, "y":0.25},
-                {"label":"6^", "x":6.5, "y":0.25},
-                {"label":"7&", "x":8.75, "y":0.25},
-                {"label":"8*", "x":9.75, "y":0.25},
-                {"label":"9(", "x":10.75, "y":0.25},
-                {"label":"0)", "x":11.75, "y":0.25},
-                {"label":"-_", "x":12.75, "y":0.25},
-                {"label":"=+", "x":13.75, "y":0.25},
-                {"label":"Backspace", "x":14.75, "y":0.25, "w":2},
-                {"label":"Page Up", "x":17, "y":0},
-
-                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
-                {"label":"Q", "x":1.75, "y":1.25},
-                {"label":"W", "x":2.75, "y":1.25},
-                {"label":"E", "x":3.75, "y":1.25},
-                {"label":"R", "x":4.75, "y":1.25},
-                {"label":"T", "x":5.75, "y":1.25},
-                {"label":"Y", "x":8.4, "y":1.25},
-                {"label":"U", "x":9.4, "y":1.25},
-                {"label":"I", "x":10.4, "y":1.25},
-                {"label":"O", "x":11.4, "y":1.25},
-                {"label":"P", "x":12.4, "y":1.25},
-                {"label":"[{", "x":13.4, "y":1.25},
-                {"label":"]}", "x":14.4, "y":1.25},
-                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
-                {"label":"Page Down", "x":17.15, "y":1},
-
-                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
-                {"label":"A", "x":1.9, "y":2.25},
-                {"label":"S", "x":2.9, "y":2.25},
-                {"label":"D", "x":3.9, "y":2.25},
-                {"label":"F", "x":4.9, "y":2.25},
-                {"label":"G", "x":5.9, "y":2.25},
-                {"label":"H", "x":8.75, "y":2.25},
-                {"label":"J", "x":9.75, "y":2.25},
-                {"label":"K", "x":10.75, "y":2.25},
-                {"label":"L", "x":11.75, "y":2.25},
-                {"label":";:", "x":12.75, "y":2.25},
-                {"label":"'\"", "x":13.75, "y":2.25},
-                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
-                {"label":"End", "x":17.25, "y":2},
-
-                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":3.25, "y":3.25},
-                {"label":"C", "x":4.25, "y":3.25},
-                {"label":"V", "x":5.25, "y":3.25},
-                {"label":"B", "x":6.25, "y":3.25},
-                {"label":"B", "x":8.25, "y":3.25},
-                {"label":"N", "x":9.25, "y":3.25},
-                {"label":"M", "x":10.25, "y":3.25},
-                {"label":",<", "x":11.25, "y":3.25},
-                {"label":".>", "x":12.25, "y":3.25},
-                {"label":"/?", "x":13.25, "y":3.25},
-                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
-                {"label":"\u2191", "x":16.25, "y":3.5},
-
-                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
-                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
-                {"label":"Space", "w":2, "x":4.75, "y":4.25},
-                {"label":"GUI", "x":6.75, "y":4.25},
-                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
-                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
-                {"label":"\u2190", "x":15.25, "y":4.5},
-                {"label":"\u2193", "x":16.25, "y":4.5},
-                {"label":"\u2192", "x":17.25, "y":4.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.75, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0.25},
-                {"label":"1!", "x":1.5, "y":0.25},
-                {"label":"2@", "x":2.5, "y":0.25},
-                {"label":"3#", "x":3.5, "y":0.25},
-                {"label":"4$", "x":4.5, "y":0.25},
-                {"label":"5%", "x":5.5, "y":0.25},
-                {"label":"6^", "x":6.5, "y":0.25},
-                {"label":"7&", "x":8.75, "y":0.25},
-                {"label":"8*", "x":9.75, "y":0.25},
-                {"label":"9(", "x":10.75, "y":0.25},
-                {"label":"0)", "x":11.75, "y":0.25},
-                {"label":"-_", "x":12.75, "y":0.25},
-                {"label":"=+", "x":13.75, "y":0.25},
-                {"label":"Backspace", "x":14.75, "y":0.25},
-                {"label":"Backspace", "x":15.75, "y":0.25},
-                {"label":"Page Up", "x":17, "y":0},
-
-                {"label":"Tab", "w":1.5, "x":0.25, "y":1.25},
-                {"label":"Q", "x":1.75, "y":1.25},
-                {"label":"W", "x":2.75, "y":1.25},
-                {"label":"E", "x":3.75, "y":1.25},
-                {"label":"R", "x":4.75, "y":1.25},
-                {"label":"T", "x":5.75, "y":1.25},
-                {"label":"Y", "x":8.4, "y":1.25},
-                {"label":"U", "x":9.4, "y":1.25},
-                {"label":"I", "x":10.4, "y":1.25},
-                {"label":"O", "x":11.4, "y":1.25},
-                {"label":"P", "x":12.4, "y":1.25},
-                {"label":"[{", "x":13.4, "y":1.25},
-                {"label":"]}", "x":14.4, "y":1.25},
-                {"label":"\\|", "w":1.5, "x":15.4, "y":1.25},
-                {"label":"Page Down", "x":17.15, "y":1},
-
-                {"label":"Caps Lock", "w":1.75, "x":0.15, "y":2.25},
-                {"label":"A", "x":1.9, "y":2.25},
-                {"label":"S", "x":2.9, "y":2.25},
-                {"label":"D", "x":3.9, "y":2.25},
-                {"label":"F", "x":4.9, "y":2.25},
-                {"label":"G", "x":5.9, "y":2.25},
-                {"label":"H", "x":8.75, "y":2.25},
-                {"label":"J", "x":9.75, "y":2.25},
-                {"label":"K", "x":10.75, "y":2.25},
-                {"label":"L", "x":11.75, "y":2.25},
-                {"label":";:", "x":12.75, "y":2.25},
-                {"label":"'\"", "x":13.75, "y":2.25},
-                {"label":"Enter", "w":2.25, "x":14.75, "y":2.25},
-                {"label":"End", "x":17.25, "y":2},
-
-                {"label":"Shift", "w":2.25, "x":0, "y":3.25},
-                {"label":"Z", "x":2.25, "y":3.25},
-                {"label":"X", "x":3.25, "y":3.25},
-                {"label":"C", "x":4.25, "y":3.25},
-                {"label":"V", "x":5.25, "y":3.25},
-                {"label":"B", "x":6.25, "y":3.25},
-                {"label":"B", "x":8.25, "y":3.25},
-                {"label":"N", "x":9.25, "y":3.25},
-                {"label":"M", "x":10.25, "y":3.25},
-                {"label":",<", "x":11.25, "y":3.25},
-                {"label":".>", "x":12.25, "y":3.25},
-                {"label":"/?", "x":13.25, "y":3.25},
-                {"label":"Shift", "w":1.75, "x":14.25, "y":3.25},
-                {"label":"\u2191", "x":16.25, "y":3.5},
-
-                {"label":"Ctrl", "w":1.5, "x":0, "y":4.25},
-                {"label":"Alt", "w":1.5, "x":3.25, "y":4.25},
-                {"label":"Space", "w":2, "x":4.75, "y":4.25},
-                {"label":"GUI", "x":6.75, "y":4.25},
-                {"label":"Space", "w":2.75, "x":8.75, "y":4.25},
-                {"label":"Fn", "w":1.5, "x":11.5, "y":4.25},
-                {"label":"\u2190", "x":15.25, "y":4.5},
-                {"label":"\u2193", "x":16.25, "y":4.5},
-                {"label":"\u2192", "x":17.25, "y":4.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+
+                {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+                {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+                {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+                {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+                {"matrix": [0, 11], "x": 12.75, "y": 0.25},
+                {"matrix": [0, 12], "x": 13.75, "y": 0.25},
+                {"matrix": [0, 13], "x": 14.75, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.75, "y": 0.25},
+
+                {"matrix": [1, 14], "x": 17, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+                {"matrix": [1, 6], "x": 8.4, "y": 1.25},
+                {"matrix": [1, 7], "x": 9.4, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.4, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.4, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.4, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.4, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.4, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.4, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 17.15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.9, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.9, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.9, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.9, "y": 2.25},
+
+                {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.25, "y": 3.25, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 16.25, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25, "w": 2},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.5, "y": 4.25, "w": 1.5},
+
+                {"matrix": [4, 12], "x": 15.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h
deleted file mode 100644
index cee1c4c656..0000000000
--- a/keyboards/skergo/skergo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright (C) 2021  Keyz.io Ltd.
-*
-* 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 3 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 ___ KC_NO
-
-/*                                                                      ┌───â”
- * ┌───┬───┬───┬───┬───┬───┬───┠      ┌───┬───┬───┬───┬───┬───┬───┬───â”│1E │   ┌───────â”
- * │00 │01 │02 │03 │04 │05 │06 │       │07 │08 │09 │0A │0B │0C │0D │0E │├───┤   │0E     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤│2E │   └───────┘
- * │10   │11 │12 │13 │14 │15 │       │16 │17 │18 │19 │1A │1B │1C │1D   │├───┤
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┠     └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤│3E │
- * │20    │21 │22 │23 │24 │25 │       │26 │27 │28 │29 │2A │2B │2C      │└───┘
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┠  ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
- * │30      │31 │32 │33 │34 │35 │   │46 │36 │37 │38 │39 │3A │3B    │┌───â”
- * ├────┬───┴───┼───┴─┬─┴───┴─┬─┴─┠└─┬─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │
- * │40  │       │42   │44     │45 │   │47        │49   │        ┌───┼───┼───â”
- * └────┘       └─────┴───────┴───┘   └──────────┴─────┘        │4C │4D │4E │
- *                                                              └───┴───┴───┘
- * - Position K46 (secondary B key) is optional
- */
-
-#define LAYOUT_2u_bs( \
-	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0E,   K1E, \
-	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K2E, \
-	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,   K3E, \
-	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,        \
-	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E    \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_split_bs( \
-	K00, K01, K02, K03, K04, K05, K06,        K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K1E, \
-	K10, K11, K12, K13, K14, K15,        K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K2E, \
-	K20, K21, K22, K23, K24, K25,        K26, K27, K28, K29, K2A, K2B,      K2C,        K3E, \
-	K30, K31, K32, K33, K34, K35,        K46, K36, K37, K38, K39, K3A, K3B, K3D,             \
-	K40,      K42,      K44, K45,        K47,           K49,           K4C, K4D, K4E         \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E }, \
-	{ K40, ___, K42, ___, K44, K45, K46, K47, ___, K49, ___, ___, K4C, K4D, K4E }  \
-}
diff --git a/keyboards/sthlmkb/lagom/info.json b/keyboards/sthlmkb/lagom/info.json
index 410d22512e..2d2ca47305 100644
--- a/keyboards/sthlmkb/lagom/info.json
+++ b/keyboards/sthlmkb/lagom/info.json
@@ -21,379 +21,409 @@
      },
     "layouts": {
         "LAYOUT_base": {
-             "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":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"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":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "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":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"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":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_splits": {
-             "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":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"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":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "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":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_iso": {
-             "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":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0, "w":2},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"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":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "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":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"|", "x":12.75, "y":2},
-                     {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 14], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 15], "x": 12.5, "y": 1},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+                {"label": "|", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        },
         "LAYOUT_split_space": {
-             "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":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"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":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "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":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                     {"label":"Alt", "x":1.25, "y":4, "w":1.25},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.25},
-                     {"label":"Space", "x":3.75, "y":4, "w":2.25},
-                     {"label":"Super", "x":6, "y":4, "w":1.25},
-                     {"label":"Space", "x":7.25, "y":4, "w":2.75},
-                     {"label":"Cmd", "x":10, "y":4, "w":1.25},
-                     {"label":"Alt", "x":11.25, "y":4, "w":1.25},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             },
-        "LAYOUT_7u_space": {
-             "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":7, "y":0},
-                     {"label":"8", "x":8, "y":0},
-                     {"label":"9", "x":9, "y":0},
-                     {"label":"0", "x":10, "y":0},
-                     {"label":"-", "x":11, "y":0},
-                     {"label":"=", "x":12, "y":0},
-                     {"label":"Backspace", "x":13, "y":0},
-                     {"label":"Delete", "x":14, "y":0},
-                     {"label":"Home", "x":15, "y":0},
-                     {"label":"ENC1", "x":16.25, "y":0},
-                     {"label":"ENC2", "x":17.5, "y":0},
-                     {"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":6.5, "y":1},
-                     {"label":"U", "x":7.5, "y":1},
-                     {"label":"I", "x":8.5, "y":1},
-                     {"label":"O", "x":9.5, "y":1},
-                     {"label":"P", "x":10.5, "y":1},
-                     {"label":"{", "x":11.5, "y":1},
-                     {"label":"}", "x":12.5, "y":1},
-                     {"label":"|", "x":13.5, "y":1, "w":1.5},
-                     {"label":"Delete", "x":15, "y":1},
-                     {"label":"Caps Lock", "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":6.75, "y":2},
-                     {"label":"J", "x":7.75, "y":2},
-                     {"label":"K", "x":8.75, "y":2},
-                     {"label":"L", "x":9.75, "y":2},
-                     {"label":";", "x":10.75, "y":2},
-                     {"label":"\"", "x":11.75, "y":2},
-                     {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                     {"label":"PgUp", "x":15, "y":2},
-                     {"label":"Shift", "x":0, "y":3, "w":1.25},
-                     {"label":"/", "x":1.25, "y":3},
-                     {"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":7.25, "y":3},
-                     {"label":"M", "x":8.25, "y":3},
-                     {"label":"<", "x":9.25, "y":3},
-                     {"label":">", "x":10.25, "y":3},
-                     {"label":"?", "x":11.25, "y":3},
-                     {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                     {"label":"Up", "x":14, "y":3},
-                     {"label":"PgDn", "x":15, "y":3},
-                     {"label":"Ctrl", "x":0, "y":4, "w":1.5},
-                     {"label":"Alt", "x":1.5, "y":4},
-                     {"label":"Cmd", "x":2.5, "y":4, "w":1.5},
-                     {"label":"Space", "x":4, "y":4, "w":7},
-                     {"label":"Cmd", "x":11, "y":4, "w":1.5},
-                     {"label":"Left", "x":13, "y":4},
-                     {"label":"Down", "x":14, "y":4},
-                     {"label":"Right", "x":15, "y":4}
-                 ]
-             }
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"label": "Super", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"label": "Cmd", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
         },
+        "LAYOUT_7u_space": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 15], "x": 15, "y": 0},
+
+                {"label": "ENC1", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "ENC2", "matrix": [1, 1], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 7], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 8], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 9], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 10], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 11], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 12], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 13], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 14], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 0], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 11], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 13], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "PgUp", "matrix": [2, 15], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "/", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "Up", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"label": "Cmd", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"label": "Left", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [4, 14], "x": 15, "y": 4}
+            ]
+        }
+    },
     "encoder": {
         "rotary": [
             { "pin_a": "D4", "pin_b": "C6" },
diff --git a/keyboards/sthlmkb/lagom/lagom.c b/keyboards/sthlmkb/lagom/lagom.c
index d26fd1e7f4..10ad6c0c32 100644
--- a/keyboards/sthlmkb/lagom/lagom.c
+++ b/keyboards/sthlmkb/lagom/lagom.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "lagom.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/sthlmkb/lagom/lagom.h b/keyboards/sthlmkb/lagom/lagom.h
deleted file mode 100644
index c27c90bd2e..0000000000
--- a/keyboards/sthlmkb/lagom/lagom.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Copyright 2022 mohoyt
- *
- * 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 ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define LAYOUT_base( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      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,      K2D, K2E, K2F,\
-   K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, 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, ___, K2D, K2E, K2F, }, \
-  {K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_splits( \
-   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,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {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, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_iso( \
-   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-   K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F,\
-   K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F, }, \
-  {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F, }, \
-  {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_split_space( \
-   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,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E      \
-) { \
-  {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, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, ___, }  \
-}
-
-#define LAYOUT_7u_space( \
-   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,      K2D, K2E, K2F,\
-   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     \
-   K40, K41, K42,                K46,                     K4B, K4C, K4D, K4E      \
-) { \
-  {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, ___, K2D, K2E, K2F, }, \
-  {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, ___, }, \
-  {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, ___, K4B, K4C, K4D, K4E, ___, }  \
-}