summary refs log tree commit diff
path: root/keyboards/handwired
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:07:32 +1000
committerGitHub <noreply@github.com>2023-04-15 21:07:32 +1000
commita84528f85392ccab60fd7130fecb83972539367f (patch)
tree4484e8b5dd0120c896ac2dabb70c2f727bae55ba /keyboards/handwired
parent54634e92634f73a6d9111833adf58214cb4278c3 (diff)
Move remaining `LAYOUT`s to data driven (#20422)
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/jn68m/info.json165
-rw-r--r--keyboards/handwired/jn68m/jn68m.h49
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/info.json166
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h43
-rw-r--r--keyboards/handwired/qc60/info.json1173
-rw-r--r--keyboards/handwired/qc60/proto/proto.h195
-rw-r--r--keyboards/handwired/sejin_eat1010r2/info.json122
-rw-r--r--keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c20
-rw-r--r--keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h74
-rw-r--r--keyboards/handwired/sono1/info.json242
-rw-r--r--keyboards/handwired/sono1/keymaps/debug/keymap.c34
-rw-r--r--keyboards/handwired/sono1/sono1.c2
-rw-r--r--keyboards/handwired/sono1/sono1.h107
13 files changed, 1131 insertions, 1261 deletions
diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json
index c7934968dc..6c83157843 100644
--- a/keyboards/handwired/jn68m/info.json
+++ b/keyboards/handwired/jn68m/info.json
@@ -16,11 +16,166 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-      "LAYOUT": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
-      },
-      "LAYOUT_splitbs": {
-        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1},
+        {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 13], "x": 14.25, "y": 4},
+        {"matrix": [4, 14], "x": 15.25, "y": 4},
+        {"matrix": [4, 15], "x": 16.25, "y": 4}
+      ]
+    },
+    "LAYOUT_splitbs": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [2, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1},
+        {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [3, 14], "x": 15.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 13], "x": 14.25, "y": 4},
+        {"matrix": [4, 14], "x": 15.25, "y": 4},
+        {"matrix": [4, 15], "x": 16.25, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/handwired/jn68m/jn68m.h b/keyboards/handwired/jn68m/jn68m.h
deleted file mode 100644
index a5500824bb..0000000000
--- a/keyboards/handwired/jn68m/jn68m.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat / MxBlue
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,           k3E, \
-    k40, k41, k42,           k45,                k49,      k4B, k4C,      k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
-
-#define LAYOUT_splitbs( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D,      k0E, k0F, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,           k1E, k1F, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39,      k3B, k3C,                k3E, \
-    k40, k41, k42,           k45,                k49,      k4B, k4C,           k4D, k4E, k4F \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \
-    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index a66f43fadc..8ef1cb0a84 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -10,94 +10,94 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [7, 16], "x": 0, "y": 0},
+                {"matrix": [6, 14], "x": 1, "y": 0},
+                {"matrix": [6, 15], "x": 2, "y": 0},
+                {"matrix": [6, 16], "x": 3, "y": 0},
+                {"matrix": [5, 14], "x": 4, "y": 0},
+                {"matrix": [5, 15], "x": 5, "y": 0},
+                {"matrix": [5, 16], "x": 6, "y": 0},
+                {"matrix": [7, 0], "x": 7, "y": 0},
+                {"matrix": [7, 1], "x": 8, "y": 0},
+                {"matrix": [7, 2], "x": 9, "y": 0},
+                {"matrix": [7, 3], "x": 10, "y": 0},
+                {"matrix": [7, 4], "x": 11, "y": 0},
+                {"matrix": [7, 5], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0},
+                {"matrix": [1, 10], "x": 14, "y": 0},
+                {"matrix": [1, 11], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1, "h": 1.6},
+                {"matrix": [5, 0], "x": 0, "y": 1},
+                {"matrix": [5, 10], "x": 1, "y": 1},
+                {"matrix": [5, 11], "x": 2, "y": 1},
+                {"matrix": [5, 12], "x": 3, "y": 1},
+                {"matrix": [5, 13], "x": 4, "y": 1},
+                {"matrix": [5, 7], "x": 5, "y": 1},
+                {"matrix": [5, 8], "x": 6, "y": 1},
+                {"matrix": [2, 0], "x": 7, "y": 1},
+                {"matrix": [2, 1], "x": 8, "y": 1},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [2, 3], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 9], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [6, 3], "x": 1.5, "y": 2},
+                {"matrix": [6, 4], "x": 2.5, "y": 2},
+                {"matrix": [6, 5], "x": 3.5, "y": 2},
+                {"matrix": [7, 8], "x": 4.5, "y": 2},
+                {"matrix": [7, 9], "x": 5.5, "y": 2},
+                {"matrix": [4, 0], "x": 6.5, "y": 2},
+                {"matrix": [4, 1], "x": 7.5, "y": 2},
+                {"matrix": [4, 2], "x": 8.5, "y": 2},
+                {"matrix": [4, 3], "x": 9.5, "y": 2},
+                {"matrix": [3, 0], "x": 10.5, "y": 2},
+                {"matrix": [3, 1], "x": 11.5, "y": 2},
+                {"matrix": [3, 2], "x": 12.5, "y": 2},
+                {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 2.6, "h": 1.2},
+                {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 2], "x": 3.75, "y": 3},
+                {"matrix": [7, 7], "x": 4.75, "y": 3},
+                {"matrix": [1, 0], "x": 5.75, "y": 3},
+                {"matrix": [1, 1], "x": 6.75, "y": 3},
+                {"matrix": [5, 3], "x": 7.75, "y": 3},
+                {"matrix": [5, 4], "x": 8.75, "y": 3},
+                {"matrix": [5, 5], "x": 9.75, "y": 3},
+                {"matrix": [5, 6], "x": 10.75, "y": 3},
+                {"matrix": [1, 2], "x": 11.75, "y": 3},
+                {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2},
 
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 3.8, "h": 1.2},
+                {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [7, 10], "x": 2.25, "y": 4},
+                {"matrix": [7, 11], "x": 3.25, "y": 4},
+                {"matrix": [7, 12], "x": 4.25, "y": 4},
+                {"matrix": [7, 14], "x": 5.25, "y": 4},
+                {"matrix": [0, 0], "x": 6.25, "y": 4},
+                {"matrix": [0, 1], "x": 7.25, "y": 4},
+                {"matrix": [0, 2], "x": 8.25, "y": 4},
+                {"matrix": [0, 3], "x": 9.25, "y": 4},
+                {"matrix": [0, 4], "x": 10.25, "y": 4},
+                {"matrix": [0, 5], "x": 11.25, "y": 4},
+                {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 6], "x": 14, "y": 4},
+                {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2},
 
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 5.5},
-                {"x": 9.25, "y": 5, "w": 1.25},
-                {"x": 10.5, "y": 5, "w": 1.25},
-                {"x": 11.75, "y": 5, "w": 1.25},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5}
+                {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5},
+                {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25},
+                {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 7], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
deleted file mode 100644
index 64d4f7bbc4..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \
-    k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \
-    k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \
-    k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \
-    k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \
-    k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \
-    { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \
-    { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \
-}
-
-#define MATRIX_TESTING_LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \
-    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \
-    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \
-}
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index 735c811451..b78ca3c807 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -24,624 +24,617 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R06", "x":14, "y":0},
-        {"label":"R07", "x":15, "y":0},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L30", "x":0, "y":3, "w":1.25},
-        {"label":"L31", "x":1.25, "y":3},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":1.75},
-        {"label":"R37", "x":15, "y":3},
-
-        {"label":"L40", "x":0, "y":4, "w":1.25},
-        {"label":"L41", "x":1.25, "y":4, "w":1.25},
-        {"label":"L42", "x":2.5, "y":4, "w":1.25},
-        {"label":"L43", "x":3.75, "y":4, "w":2.75},
-        {"label":"L44", "x":6.5, "y":4, "w":1.25},
-
-        {"label":"R43", "x":8.75, "y":4, "w":1.25},
-        {"label":"R44", "x":10, "y":4, "w":2},
-        {"label":"R42", "x":12, "y":4},
-        {"label":"R45", "x":13, "y":4},
-        {"label":"R46", "x":14, "y":4},
-        {"label":"R47", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+        {"matrix": [5, 0], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+        {"matrix": [8, 0], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+        {"matrix": [9, 5], "x": 12, "y": 4},
+        {"matrix": [9, 2], "x": 13, "y": 4},
+        {"matrix": [9, 1], "x": 14, "y": 4},
+        {"matrix": [9, 0], "x": 15, "y": 4}
       ]
     },
-
     "LAYOUT_ansi_default": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"1", "x":1, "y":0},
-        {"label":"2", "x":2, "y":0},
-        {"label":"3", "x":3, "y":0},
-        {"label":"4", "x":4, "y":0},
-        {"label":"5", "x":5, "y":0},
-        {"label":"6", "x":6, "y":0},
-
-        {"label":"7", "x":8, "y":0},
-        {"label":"8", "x":9, "y":0},
-        {"label":"9", "x":10, "y":0},
-        {"label":"0", "x":11, "y":0},
-        {"label":"-", "x":12, "y":0},
-        {"label":"=", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0, "w":2},
-
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-
-        {"label":"Y", "x":7.5, "y":1},
-        {"label":"U", "x":8.5, "y":1},
-        {"label":"I", "x":9.5, "y":1},
-        {"label":"O", "x":10.5, "y":1},
-        {"label":"P", "x":11.5, "y":1},
-        {"label":"[", "x":12.5, "y":1},
-        {"label":"]", "x":13.5, "y":1},
-        {"label":"\\", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"CapsLock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-
-        {"label":"H", "x":7.75, "y":2},
-        {"label":"J", "x":8.75, "y":2},
-        {"label":"K", "x":9.75, "y":2},
-        {"label":"L", "x":10.75, "y":2},
-        {"label":";", "x":11.75, "y":2},
-        {"label":"'", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
-        {"label":"V", "x":5.25, "y":3},
-        {"label":"B", "x":6.25, "y":3},
-
-        {"label":"N", "x":8.25, "y":3},
-        {"label":"M", "x":9.25, "y":3},
-        {"label":",", "x":10.25, "y":3},
-        {"label":".", "x":11.25, "y":3},
-        {"label":"/", "x":12.25, "y":3},
-        {"label":"Shift", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-        {"x":3.75, "y":4, "w":2.75},
-        {"x":6.5, "y":4, "w":1.25},
-
-        {"x":8.75, "y":4, "w":1.25},
-        {"x":10, "y":4, "w":2},
-        {"label":"Alt", "x":12, "y":4},
-        {"label":"Win", "x":13, "y":4},
-        {"label":"Menu", "x":14, "y":4},
-        {"label":"Ctrl", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+        {"matrix": [9, 5], "x": 12, "y": 4},
+        {"matrix": [9, 2], "x": 13, "y": 4},
+        {"matrix": [9, 1], "x": 14, "y": 4},
+        {"matrix": [9, 0], "x": 15, "y": 4}
       ]
     },
-
     "LAYOUT_ansi_alt": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R07", "x":14, "y":0, "w":2},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L31", "x":0, "y":3, "w":2.25},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"L40", "x":0, "y":4, "w":1.5},
-        {"label":"L41", "x":1.5, "y":4},
-        {"label":"L42", "x":2.5, "y":4, "w":1.5},
-        {"label":"L43", "x":4, "y":4, "w":2.75},
-        {"label":"L44", "x":6.75, "y":4},
-
-        {"label":"R43", "x":8.75, "y":4},
-        {"label":"R44", "x":9.75, "y":4, "w":2.25},
-        {"label":"R45", "x":12, "y":4, "w":1.5},
-        {"label":"R46", "x":13.5, "y":4},
-        {"label":"R47", "x":14.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": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+        {"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, 3], "x": 4, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+        {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+        {"matrix": [9, 1], "x": 13.5, "y": 4},
+        {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
       ]
     },
-
     "LAYOUT_iso_default": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R07", "x":14, "y":0, "w":2},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R17", "x":13.75, "y":2},
-        {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
-
-        {"label":"L30", "x":0, "y":3, "w":1.25},
-        {"label":"L31", "x":1.25, "y":3},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"L40", "x":0, "y":4, "w":1.25},
-        {"label":"L41", "x":1.25, "y":4, "w":1.25},
-        {"label":"L42", "x":2.5, "y":4, "w":1.25},
-        {"label":"L43", "x":3.75, "y":4, "w":2.75},
-        {"label":"L44", "x":6.5, "y":4, "w":1.25},
-
-        {"label":"R43", "x":8.75, "y":4, "w":1.25},
-        {"label":"R44", "x":10, "y":4, "w":2},
-        {"label":"R42", "x":12, "y":4},
-        {"label":"R45", "x":13, "y":4},
-        {"label":"R46", "x":14, "y":4},
-        {"label":"R47", "x":15, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [6, 0], "x": 13.75, "y": 2},
+        {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 1.25},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 10, "y": 4, "w": 2},
+        {"matrix": [9, 5], "x": 12, "y": 4},
+        {"matrix": [9, 2], "x": 13, "y": 4},
+        {"matrix": [9, 1], "x": 14, "y": 4},
+        {"matrix": [9, 0], "x": 15, "y": 4}
       ]
     },
-
     "LAYOUT_iso_alt": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R07", "x":14, "y":0, "w":2},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R17", "x":13.75, "y":2},
-        {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2},
-
-        {"label":"L30", "x":0, "y":3, "w":1.25},
-        {"label":"L31", "x":1.25, "y":3},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"L40", "x":0, "y":4, "w":1.5},
-        {"label":"L41", "x":1.5, "y":4},
-        {"label":"L42", "x":2.5, "y":4, "w":1.5},
-        {"label":"L43", "x":4, "y":4, "w":2.75},
-        {"label":"L44", "x":6.75, "y":4},
-
-        {"label":"R43", "x":8.75, "y":4},
-        {"label":"R44", "x":9.75, "y":4, "w":2.25},
-        {"label":"R45", "x":12, "y":4, "w":1.5},
-        {"label":"R46", "x":13.5, "y":4},
-        {"label":"R47", "x":14.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": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [6, 0], "x": 13.75, "y": 2},
+        {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+        {"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, 3], "x": 4, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+        {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+        {"matrix": [9, 1], "x": 13.5, "y": 4},
+        {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
       ]
     },
-
     "LAYOUT_hhkb_default": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R06", "x":14, "y":0},
-        {"label":"R07", "x":15, "y":0},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L31", "x":0, "y":3, "w":2.25},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":1.75},
-        {"label":"R37", "x":15, "y":3},
-
-        {"label":"L41", "x":1.5, "y":4},
-        {"label":"L42", "x":2.5, "y":4, "w":1.5},
-        {"label":"L43", "x":4, "y":4, "w":2.75},
-        {"label":"L44", "x":6.75, "y":4},
-
-        {"label":"R43", "x":8.75, "y":4},
-        {"label":"R44", "x":9.75, "y":4, "w":2.25},
-        {"label":"R45", "x":12, "y":4, "w":1.5},
-        {"label":"R46", "x":13.5, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+        {"matrix": [5, 0], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+        {"matrix": [8, 0], "x": 15, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+        {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+        {"matrix": [9, 1], "x": 13.5, "y": 4}
       ]
     },
-
     "LAYOUT_hhkb_split_lshift": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R06", "x":14, "y":0},
-        {"label":"R07", "x":15, "y":0},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L30", "x":0, "y":3, "w":1.25},
-        {"label":"L31", "x":1.25, "y":3},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":1.75},
-        {"label":"R37", "x":15, "y":3},
-
-        {"label":"L41", "x":1.5, "y":4},
-        {"label":"L42", "x":2.5, "y":4, "w":1.5},
-        {"label":"L43", "x":4, "y":4, "w":2.75},
-        {"label":"L44", "x":6.75, "y":4},
-
-        {"label":"R43", "x":8.75, "y":4},
-        {"label":"R44", "x":9.75, "y":4, "w":2.25},
-        {"label":"R45", "x":12, "y":4, "w":1.5},
-        {"label":"R46", "x":13.5, "y":4}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+
+        {"matrix": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 1], "x": 14, "y": 0},
+        {"matrix": [5, 0], "x": 15, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75},
+        {"matrix": [8, 0], "x": 15, "y": 3},
+
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+        {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+        {"matrix": [9, 1], "x": 13.5, "y": 4}
       ]
     },
-
     "LAYOUT_wkl_default": {
       "layout": [
-        {"label":"L00", "x":0, "y":0},
-        {"label":"L01", "x":1, "y":0},
-        {"label":"L02", "x":2, "y":0},
-        {"label":"L03", "x":3, "y":0},
-        {"label":"L04", "x":4, "y":0},
-        {"label":"L05", "x":5, "y":0},
-        {"label":"L06", "x":6, "y":0},
-
-        {"label":"R00", "x":8, "y":0},
-        {"label":"R01", "x":9, "y":0},
-        {"label":"R02", "x":10, "y":0},
-        {"label":"R03", "x":11, "y":0},
-        {"label":"R04", "x":12, "y":0},
-        {"label":"R05", "x":13, "y":0},
-        {"label":"R07", "x":14, "y":0, "w":2},
-
-        {"label":"L10", "x":0, "y":1, "w":1.5},
-        {"label":"L11", "x":1.5, "y":1},
-        {"label":"L12", "x":2.5, "y":1},
-        {"label":"L13", "x":3.5, "y":1},
-        {"label":"L14", "x":4.5, "y":1},
-        {"label":"L15", "x":5.5, "y":1},
-
-        {"label":"R10", "x":7.5, "y":1},
-        {"label":"R11", "x":8.5, "y":1},
-        {"label":"R12", "x":9.5, "y":1},
-        {"label":"R13", "x":10.5, "y":1},
-        {"label":"R14", "x":11.5, "y":1},
-        {"label":"R15", "x":12.5, "y":1},
-        {"label":"R16", "x":13.5, "y":1},
-        {"label":"R17", "x":14.5, "y":1, "w":1.5},
-
-        {"label":"L20", "x":0, "y":2, "w":1.75},
-        {"label":"L21", "x":1.75, "y":2},
-        {"label":"L22", "x":2.75, "y":2},
-        {"label":"L23", "x":3.75, "y":2},
-        {"label":"L24", "x":4.75, "y":2},
-        {"label":"L25", "x":5.75, "y":2},
-
-        {"label":"R21", "x":7.75, "y":2},
-        {"label":"R22", "x":8.75, "y":2},
-        {"label":"R23", "x":9.75, "y":2},
-        {"label":"R24", "x":10.75, "y":2},
-        {"label":"R25", "x":11.75, "y":2},
-        {"label":"R26", "x":12.75, "y":2},
-        {"label":"R27", "x":13.75, "y":2, "w":2.25},
-
-        {"label":"L31", "x":0, "y":3, "w":2.25},
-        {"label":"L32", "x":2.25, "y":3},
-        {"label":"L33", "x":3.25, "y":3},
-        {"label":"L34", "x":4.25, "y":3},
-        {"label":"L35", "x":5.25, "y":3},
-        {"label":"L36", "x":6.25, "y":3},
-
-        {"label":"R31", "x":8.25, "y":3},
-        {"label":"R32", "x":9.25, "y":3},
-        {"label":"R33", "x":10.25, "y":3},
-        {"label":"R34", "x":11.25, "y":3},
-        {"label":"R35", "x":12.25, "y":3},
-        {"label":"R36", "x":13.25, "y":3, "w":2.75},
-
-        {"label":"L40", "x":0, "y":4, "w":1.5},
-        {"label":"L42", "x":2.5, "y":4, "w":1.5},
-        {"label":"L43", "x":4, "y":4, "w":2.75},
-        {"label":"L44", "x":6.75, "y":4},
-
-        {"label":"R43", "x":8.75, "y":4},
-        {"label":"R44", "x":9.75, "y":4, "w":2.25},
-        {"label":"R45", "x":12, "y":4, "w":1.5},
-        {"label":"R47", "x":14.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": [5, 7], "x": 8, "y": 0},
+        {"matrix": [5, 6], "x": 9, "y": 0},
+        {"matrix": [5, 5], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 3], "x": 12, "y": 0},
+        {"matrix": [5, 2], "x": 13, "y": 0},
+        {"matrix": [5, 0], "x": 14, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+        {"matrix": [6, 7], "x": 7.5, "y": 1},
+        {"matrix": [6, 6], "x": 8.5, "y": 1},
+        {"matrix": [6, 5], "x": 9.5, "y": 1},
+        {"matrix": [6, 4], "x": 10.5, "y": 1},
+        {"matrix": [6, 3], "x": 11.5, "y": 1},
+        {"matrix": [6, 2], "x": 12.5, "y": 1},
+        {"matrix": [6, 1], "x": 13.5, "y": 1},
+        {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+        {"matrix": [7, 6], "x": 7.75, "y": 2},
+        {"matrix": [7, 5], "x": 8.75, "y": 2},
+        {"matrix": [7, 4], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 2], "x": 11.75, "y": 2},
+        {"matrix": [7, 1], "x": 12.75, "y": 2},
+        {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+        {"matrix": [8, 6], "x": 8.25, "y": 3},
+        {"matrix": [8, 5], "x": 9.25, "y": 3},
+        {"matrix": [8, 4], "x": 10.25, "y": 3},
+        {"matrix": [8, 3], "x": 11.25, "y": 3},
+        {"matrix": [8, 2], "x": 12.25, "y": 3},
+        {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+        {"matrix": [4, 4], "x": 6.75, "y": 4},
+
+        {"matrix": [9, 4], "x": 8.75, "y": 4},
+        {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25},
+        {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5},
+        {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h
deleted file mode 100644
index 8ba28c7250..0000000000
--- a/keyboards/handwired/qc60/proto/proto.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph>
- *
- * 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
-
-/* Split Backspace
- * {R07, XXX, R05, R04, R03, R02, R01, R00}
- *
- * Split Right Shift
- * {R37, R36, R35, R34, R33, R32, R31, XXX}
- *
- * Split Left Shift
- * {L30, L31, L32, L33, L34, L35, L36, XXX}
- *
- * 6-key Bottom-left row
- * {R47, R46, R45, R44, R43, R42, XXX, XXX}
- */
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36, R37, \
-    L40, L41, L42, L43, L44,                     R43, R44, R42, R45, R46, R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, R06, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {R37, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_ansi_default( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,      R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,      \
-    L40, L41, L42, L43, L44,                     R43, R44, R42, R45, R46, R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_ansi_alt( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,      R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,      \
-    L40, L41, L42, L43, L44,                     R43, R44,      R45, R46, R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_iso_default( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,           R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16,           \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R17, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,           \
-    L40, L41, L42, L43, L44,                     R43, R44, R42, R45, R46,      R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, R46, R45, R44, R43, R42, XXX, XXX}, \
-}
-
-#define LAYOUT_iso_alt( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,           R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16,           \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R17, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,           \
-    L40, L41, L42, L43, L44,                     R43, R44,      R45, R46,      R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_hhkb_default( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36, R37, \
-         L41, L42, L43, L44,                     R43, R44,      R45, R46       \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
-    {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, R06, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {R37, R36, R35, R34, R33, R32, R31, XXX}, \
-    {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_hhkb_split_lshift( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36, R37, \
-         L41, L42, L43, L44,                     R43, R44,      R45, R46       \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {L30, L31, L32, L33, L34, L35, L36, XXX}, \
-    {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, R06, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {R37, R36, R35, R34, R33, R32, R31, XXX}, \
-    {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \
-}
-
-#define LAYOUT_wkl_default( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05,      R07, \
-    L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, R27, \
-         L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,       \
-    L40,      L42, L43, L44,                     R43, R44,      R45,      R47  \
-) \
-{ \
-    {L00, L01, L02, L03, L04, L05, L06, XXX}, \
-    {L10, L11, L12, L13, L14, L15, XXX, XXX}, \
-    {L20, L21, L22, L23, L24, L25, XXX, XXX}, \
-    {XXX, L31, L32, L33, L34, L35, L36, XXX}, \
-    {L40, XXX, L42, L43, L44, XXX, XXX, XXX}, \
-    {R07, XXX, R05, R04, R03, R02, R01, R00}, \
-    {R17, R16, R15, R14, R13, R12, R11, R10}, \
-    {R27, R26, R25, R24, R23, R22, R21, XXX}, \
-    {XXX, R36, R35, R34, R33, R32, R31, XXX}, \
-    {R47, XXX, R45, R44, R43, XXX, XXX, XXX}, \
-}
diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/info.json
index e913412a9f..1d39802cf8 100644
--- a/keyboards/handwired/sejin_eat1010r2/info.json
+++ b/keyboards/handwired/sejin_eat1010r2/info.json
@@ -33,7 +33,127 @@
     },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"\u2190", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.5, "y":2.5, "w":1.5, "h":2}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 11], "x": 2, "y": 0},
+                {"matrix": [2, 11], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [1, 7], "x": 5, "y": 0},
+
+                {"matrix": [1, 5], "x": 6.5, "y": 0},
+                {"matrix": [2, 5], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 3], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 4], "x": 11, "y": 0},
+                {"matrix": [3, 5], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 12], "x": 15.25, "y": 0},
+                {"matrix": [2, 12], "x": 16.25, "y": 0},
+                {"matrix": [1, 13], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 11], "x": 2, "y": 1.5},
+                {"matrix": [3, 7], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [1, 1], "x": 5, "y": 1.5},
+                {"matrix": [1, 2], "x": 6, "y": 1.5},
+                {"matrix": [2, 2], "x": 7, "y": 1.5},
+                {"matrix": [4, 5], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 3], "x": 10, "y": 1.5},
+                {"matrix": [3, 3], "x": 11, "y": 1.5},
+                {"matrix": [4, 4], "x": 12, "y": 1.5},
+                {"matrix": [0, 6], "x": 13, "y": 1.5},
+                {"matrix": [4, 6], "x": 14, "y": 1.5},
+
+                {"matrix": [3, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 13], "x": 18.5, "y": 1.5},
+                {"matrix": [3, 14], "x": 19.5, "y": 1.5},
+                {"matrix": [4, 14], "x": 20.5, "y": 1.5},
+                {"matrix": [3, 15], "x": 21.5, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [0, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [0, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [0, 7], "x": 13.5, "y": 2.5, "w": 1.5, "h": 2},
+
+                {"matrix": [0, 5], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [0, 13], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 19.5, "y": 2.5},
+                {"matrix": [0, 14], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 2.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 11.75, "y": 3.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
+
+                {"matrix": [7, 10], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 11], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [5, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 14], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 15], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [7, 9], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 8], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 8], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 9], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 6], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 15], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
index 67691cd542..6032779422 100644
--- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
+++ b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c
@@ -15,6 +15,26 @@
  */
 #include QMK_KEYBOARD_H
 
+#define LAYOUT_debug( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
+    K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
+    K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
+    K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \
+}
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_debug(
diff --git a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h b/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
deleted file mode 100644
index 9618ed6b64..0000000000
--- a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright 2023 DmNosachev
- *
- * 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
-
-/* 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( \
-	K10,      K1B, K2B, K27, K17,   K15, K25, K14, K13,    K24, K35, K26, K16,   K1C, K2C, K1D, \
-	K20, K30, K3B, K37, K21, K11, K12, K22, K45, K34, K23, K33, K44, K06, K46,   K36, K3C, K3D,  K2D, K3E, K4E, K3F, \
-	K40,  K00, K4B, K47, K41, K31, K32, K42, K55, K04, K43, K03, K54, K07,       K05, K4C, K0C,  K0D, K4D, K0E, K4F, \
-	K70,   K50, K0B, K67, K51, K01, K02, K52, K65, K64, K53,              K63,                   K5C, K5D, K5E, \
-	K7A,    K6B, K5B, K77, K71, K61, K62, K72, K75, K74, K73,             K6A,        K56,       K6C, K6D, K6E, K5F, \
-	K79,     K78,               K7B,                               K68,   K69,   K66, K76, K7C,  K7E,      K7F \
-) \
-{ \
-/* 0 */  { K00, K01, K02, K03, K04, K05, K06, K07, XXX, XXX, XXX, K0B, K0C, K0D, K0E, XXX }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX, K1B, K1C, K1D, XXX, XXX }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, K26, K27, XXX, XXX, XXX, K2B, K2C, K2D, XXX, XXX }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, K46, K47, XXX, XXX, XXX, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */  { XXX, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, XXX, K7E, K7F }  \
-}
-/*          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F     */
-
-#define LAYOUT_debug( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \
-	K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \
-	K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \
-	K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F  \
-) \
-{ \
-/* 0 */  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-/* 1 */  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-/* 2 */  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
-/* 3 */  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
-/* 4 */  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
-/* 5 */  { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
-/* 6 */  { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \
-/* 7 */  { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F }  \
-}
-/*          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F     */
-
diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json
index 519ed121ed..e9424105a1 100644
--- a/keyboards/handwired/sono1/info.json
+++ b/keyboards/handwired/sono1/info.json
@@ -10,119 +10,135 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"F11", "x":0, "y":0},
-                {"label":"F12", "x":1.25, "y":0},
-                {"label":"F1", "x":2.75, "y":0, "w":1.25},
-                {"label":"F2", "x":4, "y":0, "w":1.25},
-                {"label":"F3", "x":5.25, "y":0, "w":1.25},
-                {"label":"F4", "x":6.5, "y":0, "w":1.25},
-                {"label":"F5", "x":7.75, "y":0, "w":1.25},
-                {"label":"F6", "x":9.25, "y":0, "w":1.25},
-                {"label":"F7", "x":10.5, "y":0, "w":1.25},
-                {"label":"F8", "x":11.75, "y":0, "w":1.25},
-                {"label":"F9", "x":13, "y":0, "w":1.25},
-                {"label":"F10", "x":14.25, "y":0, "w":1.25},
-                {"label":"PgUp", "x":16, "y":0},
-                {"label":"PgDn", "x":17, "y":0},
-                {"label":"LOCK", "x":18.5, "y":0.5},
-
-                {"label":"Esc", "x":0, "y":1.5, "w":1.25},
-                {"label":"!", "x":1.25, "y":1.5},
-                {"label":"@", "x":2.25, "y":1.5},
-                {"label":"#", "x":3.25, "y":1.5},
-                {"label":"$", "x":4.25, "y":1.5},
-                {"label":"%", "x":5.25, "y":1.5},
-                {"label":"^", "x":6.25, "y":1.5},
-                {"label":"&", "x":7.25, "y":1.5},
-                {"label":"*", "x":8.25, "y":1.5},
-                {"label":"(", "x":9.25, "y":1.5},
-                {"label":")", "x":10.25, "y":1.5},
-                {"label":"_", "x":11.25, "y":1.5},
-                {"label":"+", "x":12.25, "y":1.5},
-                {"label":"~", "x":13.25, "y":1.5},
-                {"label":"BksSpc", "x":14.25, "y":1.5, "w":1.25},
-                {"label":"Home", "x":16, "y":1},
-                {"label":"End", "x":17, "y":1},
-                {"label":"/", "x":18.5, "y":1.5},
-                {"label":"*", "x":19.5, "y":1.5},
-                {"label":"-", "x":20.5, "y":1.5},
-                {"label":"+", "x":21.5, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.75, "h":2},
-                {"label":"Ins", "x":16, "y":2},
-                {"label":"Del", "x":17, "y":2},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+=", "x":21.5, "y":2.5},
-
-                {"label":"Ctrl", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"|", "x":12.75, "y":3.5},
-                {"label":"Up", "x":16, "y":3.5, "w":2},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":".", "x":21.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.5},
-                {"label":"Z", "x":2.5, "y":4.5},
-                {"label":"X", "x":3.5, "y":4.5},
-                {"label":"C", "x":4.5, "y":4.5},
-                {"label":"V", "x":5.5, "y":4.5},
-                {"label":"B", "x":6.5, "y":4.5},
-                {"label":"N", "x":7.5, "y":4.5},
-                {"label":"M", "x":8.5, "y":4.5},
-                {"label":"<", "x":9.5, "y":4.5},
-                {"label":">", "x":10.5, "y":4.5},
-                {"label":"?", "x":11.5, "y":4.5},
-                {"label":"MUS", "x":12.5, "y":4.5},
-                {"label":"Shift", "x":13.5, "y":4.5, "w":2},
-                {"label":"Left", "x":16, "y":4.5},
-                {"label":"Right", "x":17, "y":4.5},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"<", "x":21.5, "y":4.5},
-
-                {"label":"Caps", "x":0, "y":5.5},
-                {"label":"Alt", "x":1, "y":5.5},
-                {"label":"App", "x":2, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":3.25, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4.75, "y":5.5, "w":2.25},
-                {"label":"Space", "x":7, "y":5.5, "w":2.25},
-                {"label":"Enter", "x":9.25, "y":5.5, "w":3},
-                {"label":"Ctrl", "x":12.25, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":14.5, "y":5.5},
-                {"label":"Down", "x":16, "y":5.5, "w":2},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"000", "x":19.5, "y":5.5},
-                {"label":"Enter", "x":20.5, "y":5.5, "w":2},
-                {"label":"Fn", "x":5.75, "y":6.5, "w":1.25},
-                {"label":"BkSpc", "x":7, "y":6.5, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.75, "y": 0, "w": 1.25},
+                {"matrix": [0, 3], "x": 4, "y": 0, "w": 1.25},
+                {"matrix": [0, 4], "x": 5.25, "y": 0, "w": 1.25},
+                {"matrix": [0, 5], "x": 6.5, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 7.75, "y": 0, "w": 1.25},
+
+                {"matrix": [0, 7], "x": 9.25, "y": 0, "w": 1.25},
+                {"matrix": [1, 0], "x": 10.5, "y": 0, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.75, "y": 0, "w": 1.25},
+                {"matrix": [1, 2], "x": 13, "y": 0, "w": 1.25},
+                {"matrix": [1, 3], "x": 14.25, "y": 0, "w": 1.25},
+
+                {"matrix": [9, 7], "x": 16, "y": 0},
+                {"matrix": [10, 0], "x": 17, "y": 0},
+
+                {"matrix": [13, 6], "x": 18.5, "y": 0.5},
+
+                {"matrix": [1, 4], "x": 0, "y": 1.5, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 2.25, "y": 1.5},
+                {"matrix": [1, 7], "x": 3.25, "y": 1.5},
+                {"matrix": [2, 0], "x": 4.25, "y": 1.5},
+                {"matrix": [2, 1], "x": 5.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 6.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 7.25, "y": 1.5},
+                {"matrix": [2, 4], "x": 8.25, "y": 1.5},
+                {"matrix": [2, 5], "x": 9.25, "y": 1.5},
+                {"matrix": [2, 6], "x": 10.25, "y": 1.5},
+                {"matrix": [2, 7], "x": 11.25, "y": 1.5},
+                {"matrix": [3, 0], "x": 12.25, "y": 1.5},
+                {"matrix": [3, 1], "x": 13.25, "y": 1.5},
+                {"matrix": [7, 4], "x": 14.25, "y": 1.5, "w": 1.25},
+
+                {"matrix": [10, 1], "x": 16, "y": 1},
+                {"matrix": [10, 2], "x": 17, "y": 1},
+
+                {"matrix": [12, 0], "x": 18.5, "y": 1.5},
+                {"matrix": [13, 0], "x": 19.5, "y": 1.5},
+                {"matrix": [14, 0], "x": 20.5, "y": 1.5},
+                {"matrix": [12, 1], "x": 21.5, "y": 1.5},
+
+                {"matrix": [7, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.75, "h": 2},
+
+                {"matrix": [10, 3], "x": 16, "y": 2},
+                {"matrix": [10, 4], "x": 17, "y": 2},
+
+                {"matrix": [13, 1], "x": 18.5, "y": 2.5},
+                {"matrix": [14, 1], "x": 19.5, "y": 2.5},
+                {"matrix": [12, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [13, 2], "x": 21.5, "y": 2.5},
+
+                {"matrix": [7, 7], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 7], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 0], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 10.75, "y": 3.5},
+                {"matrix": [8, 0], "x": 11.75, "y": 3.5},
+                {"matrix": [8, 1], "x": 12.75, "y": 3.5},
+
+                {"matrix": [11, 0], "x": 16, "y": 3.5, "w": 2},
+
+                {"matrix": [14, 2], "x": 18.5, "y": 3.5},
+                {"matrix": [12, 3], "x": 19.5, "y": 3.5},
+                {"matrix": [13, 3], "x": 20.5, "y": 3.5},
+                {"matrix": [14, 3], "x": 21.5, "y": 3.5},
+
+                {"matrix": [8, 2], "x": 0, "y": 4.5, "w": 2.5},
+                {"matrix": [6, 1], "x": 2.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 3.5, "y": 4.5},
+                {"matrix": [6, 3], "x": 4.5, "y": 4.5},
+                {"matrix": [6, 4], "x": 5.5, "y": 4.5},
+                {"matrix": [6, 5], "x": 6.5, "y": 4.5},
+                {"matrix": [6, 6], "x": 7.5, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.5, "y": 4.5},
+                {"matrix": [7, 0], "x": 9.5, "y": 4.5},
+                {"matrix": [7, 1], "x": 10.5, "y": 4.5},
+                {"matrix": [7, 2], "x": 11.5, "y": 4.5},
+                {"matrix": [7, 3], "x": 12.5, "y": 4.5},
+                {"matrix": [8, 3], "x": 13.5, "y": 4.5, "w": 2},
+
+                {"matrix": [11, 1], "x": 16, "y": 4.5},
+                {"matrix": [11, 2], "x": 17, "y": 4.5},
+
+                {"matrix": [12, 4], "x": 18.5, "y": 4.5},
+                {"matrix": [13, 4], "x": 19.5, "y": 4.5},
+                {"matrix": [14, 4], "x": 20.5, "y": 4.5},
+                {"matrix": [12, 5], "x": 21.5, "y": 4.5},
+
+                {"matrix": [8, 4], "x": 0, "y": 5.5},
+                {"matrix": [8, 5], "x": 1, "y": 5.5},
+                {"matrix": [8, 6], "x": 2, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 7], "x": 3.25, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 0], "x": 4.75, "y": 5.5, "w": 2.25},
+                {"matrix": [9, 1], "x": 7, "y": 5.5, "w": 2.25},
+                {"matrix": [9, 2], "x": 9.25, "y": 5.5, "w": 3},
+                {"matrix": [9, 3], "x": 12.25, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 14.5, "y": 5.5},
+
+                {"matrix": [11, 3], "x": 16, "y": 5.5, "w": 2},
+
+                {"matrix": [13, 5], "x": 18.5, "y": 5.5},
+                {"matrix": [14, 5], "x": 19.5, "y": 5.5},
+                {"matrix": [12, 6], "x": 20.5, "y": 5.5, "w": 2},
+
+                {"matrix": [9, 5], "x": 5.75, "y": 6.5, "w": 1.25},
+                {"matrix": [9, 6], "x": 7, "y": 6.5, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/handwired/sono1/keymaps/debug/keymap.c b/keyboards/handwired/sono1/keymaps/debug/keymap.c
index 3e4eb6eae3..77f2f52d1e 100644
--- a/keyboards/handwired/sono1/keymaps/debug/keymap.c
+++ b/keyboards/handwired/sono1/keymaps/debug/keymap.c
@@ -15,6 +15,40 @@
  */
 #include QMK_KEYBOARD_H
 
+#define LAYOUT_debug( \
+    K00, K01, K02, K03, K04, K05, K06, K07, \
+    K10, K11, K12, K13, K14, K15, K16, K17, \
+    K20, K21, K22, K23, K24, K25, K26, K27, \
+    K30, K31, K32, K33, K34, K35, K36, K37, \
+    K40, K41, K42, K43, K44, K45, K46, K47, \
+    K50, K51, K52, K53, K54, K55, K56, K57, \
+    K60, K61, K62, K63, K64, K65, K66, K67, \
+    K70, K71, K72, K73, K74, K75, K76, K77, \
+    K80, K81, K82, K83, K84, K85, K86, K87, \
+    K90, K91, K92, K93, K94, K95, K96, K97, \
+    KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
+    KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
+    KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
+    KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
+    KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77 }, \
+    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
+    { K90, K91, K92, K93, K94, K95, K96, K97 }, \
+    { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
+    { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
+    { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
+    { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
+    { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
+}
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [0] = LAYOUT_debug(
diff --git a/keyboards/handwired/sono1/sono1.c b/keyboards/handwired/sono1/sono1.c
index 9d8f79141d..d19f188a19 100644
--- a/keyboards/handwired/sono1/sono1.c
+++ b/keyboards/handwired/sono1/sono1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sono1.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
   /* LED pins setup */
diff --git a/keyboards/handwired/sono1/sono1.h b/keyboards/handwired/sono1/sono1.h
deleted file mode 100644
index c49992d15d..0000000000
--- a/keyboards/handwired/sono1/sono1.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2020 DmNosachev
- *
- * 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 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.
- */
-
-/*
-,---------------------------------------------------------------------------------------------------------,  ,-----,
-|  <  |  |NumLk|  |  f1  |  f2  |  f3  |  f4  |  f5  |   |  f6  |  f7  |  f8  |  f9  | f10  | |RlUp |RlDn |  |CurLk|
-|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
-| Esc  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | = - |  ^  |  ^  |  BS  | |Home |Help |  |  *  |  /  |  -  |  +  |
-|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
-|  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | ~@  | {[  |   Return  | | Ins | Del |  |  7  |  8  |  9  |  =  |
-|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
-|  Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  | +;  | *:  | }]  |          | |    Up     |  |  4  |  5  |  6  |  .  |
-|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
-|   Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  | ?/  | --  |    Shift     | |Left |Right|  |  1  |  2  |  3  |  ,  |
-|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
-|Caps | Opt |Kana | Cmd |   Space1    |    Space2   |    Space3       | Enter |       | Alt | |   Down    |  |  0  | 000 |   Enter   |
-`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
-                               |Thumb1|Thumb2|
-                               `-------------'
-*/
-#define LAYOUT( \
-    K00,   K01,   K02,  K03,  K04,  K05,  K06,     K07,  K10,  K11,  K12,  K13,  K97, KA0,   KD6, \
-    K14,  K15, K16, K17, K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K74,  KA1, KA2,   KC0, KD0, KE0, KC1, \
-    K75,   K32, K33, K34, K35, K36, K37, K40, K41, K42, K43, K44, K45,     K76,  KA3, KA4,   KD1, KE1, KC2, KD2, \
-    K77,    K47, K50, K51, K52, K53, K54, K55, K56, K57, K60, K80, K81,            KB0,      KE2, KC3, KD3, KE3, \
-    K82,     K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K83,         KB1, KB2,   KC4, KD4, KE4, KC5,\
-    K84,  K85,  K86,  K87,      K90,      K91,      K92,     K93,   K94,           KB3,      KD5, KE5,   KC6, \
-                                K95, K96 \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, XXX, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97 }, \
-    { KA0, KA1, KA2, KA3, KA4, XXX, XXX, XXX }, \
-    { KB0, KB1, KB2, KB3, XXX, XXX, XXX, XXX }, \
-    { KC0, KC1, KC2, KC3, KC4, KC5, KC6, XXX }, \
-    { KD0, KD1, KD2, KD3, KD4, KD5, KD6, XXX }, \
-    { KE0, KE1, KE2, KE3, KE4, KE5, XXX, XXX } \
-}
-
-#define LAYOUT_debug( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37, \
-    K40, K41, K42, K43, K44, K45, K46, K47, \
-    K50, K51, K52, K53, K54, K55, K56, K57, \
-    K60, K61, K62, K63, K64, K65, K66, K67, \
-    K70, K71, K72, K73, K74, K75, K76, K77, \
-    K80, K81, K82, K83, K84, K85, K86, K87, \
-    K90, K91, K92, K93, K94, K95, K96, K97, \
-    KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \
-    KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \
-    KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \
-    KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \
-    KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76, K77 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97 }, \
-    { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \
-    { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \
-    { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \
-    { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \
-    { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \
-}