85 files changed, 2335 insertions, 3482 deletions
diff --git a/keyboards/0xc7/61key/61key.h b/keyboards/0xc7/61key/61key.h
deleted file mode 100644
index 8767b2df1d..0000000000
--- a/keyboards/0xc7/61key/61key.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 0xC7
- *
- * 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 KC_NOt, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define ___ 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_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,           K3D, \
-    K40, K41, K42,           K45,           K48, K49,      K4B,      K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, ___, ___, K3D }, \
-    { K40, K41, K42, ___, ___, K45, ___, ___, K48, K49, ___, K4B, ___, K4D }  \
-}
diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json
index 569a054daf..fe2b9ef8b4 100644
--- a/keyboards/0xc7/61key/info.json
+++ b/keyboards/0xc7/61key/info.json
@@ -21,71 +21,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.h b/keyboards/1upkeyboards/1up60hse/1up60hse.h
deleted file mode 100644
index f1b4f5e43e..0000000000
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments representing the physical
-// layout of the board and position of the keys
-// The second converts the arguments into a two-dimensional array which 
-// represents the switch matrix. 
-#define LAYOUT_60_ansi( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,           K3D, \
-        K40, K41, K42,             K45,              K49, K4A, K4B,      K4D  \
-) { \
-        { K00,  K01,  K02,  K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D }, \
-        { K10,  K11,  K12,  K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D }, \
-        { K20,  K21,  K22,  K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D }, \
-        { K30,  K31,  K32,  K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, KC_NO, K3D }, \
-        { K40,  K41,  K42,  KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D }  \
-}
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 08b85923a3..475a935123 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -26,7 +26,73 @@
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
        }
    }
 }
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 6600d6d24d..eb5c0e4a9d 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -26,67 +26,71 @@
  "layouts": {
    "LAYOUT_60_ansi": {
      "layout": [
-        {"label":"`", "x":0, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"label":"1", "x":1, "y":0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"label":"2", "x":2, "y":0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"label":"3", "x":3, "y":0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"label":"4", "x":4, "y":0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"label":"5", "x":5, "y":0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"label":"6", "x":6, "y":0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"label":"7", "x":7, "y":0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"label":"8", "x":8, "y":0},
+        {"matrix": [1, 0], "x": 8, "y": 0},
-        {"label":"9", "x":9, "y":0},
+        {"matrix": [1, 1], "x": 9, "y": 0},
-        {"label":"0", "x":10, "y":0},
+        {"matrix": [1, 2], "x": 10, "y": 0},
-        {"label":"-", "x":11, "y":0},
+        {"matrix": [1, 3], "x": 11, "y": 0},
-        {"label":"=", "x":12, "y":0},
+        {"matrix": [1, 4], "x": 12, "y": 0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
+        {"matrix": [1, 5], "x": 13, "y": 0, "w": 2},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
+        {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5},
-        {"label":"W", "x":2.5, "y":1},
+        {"matrix": [1, 7], "x": 1.5, "y": 1},
-        {"label":"E", "x":3.5, "y":1},
+        {"matrix": [2, 0], "x": 2.5, "y": 1},
-        {"label":"R", "x":4.5, "y":1},
+        {"matrix": [2, 1], "x": 3.5, "y": 1},
-        {"label":"T", "x":5.5, "y":1},
+        {"matrix": [2, 2], "x": 4.5, "y": 1},
-        {"label":"Y", "x":6.5, "y":1},
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
-        {"label":"U", "x":7.5, "y":1},
+        {"matrix": [2, 4], "x": 6.5, "y": 1},
-        {"label":"I", "x":8.5, "y":1},
+        {"matrix": [2, 5], "x": 7.5, "y": 1},
-        {"label":"O", "x":9.5, "y":1},
+        {"matrix": [2, 6], "x": 8.5, "y": 1},
-        {"label":"P", "x":10.5, "y":1},
+        {"matrix": [2, 7], "x": 9.5, "y": 1},
-        {"label":"[", "x":11.5, "y":1},
+        {"matrix": [3, 0], "x": 10.5, "y": 1},
-        {"label":"]", "x":12.5, "y":1},
+        {"matrix": [3, 1], "x": 11.5, "y": 1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
+        {"matrix": [3, 2], "x": 12.5, "y": 1},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+        {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
+        {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75},
-        {"label":"D", "x":3.75, "y":2},
+        {"matrix": [3, 5], "x": 1.75, "y": 2},
-        {"label":"F", "x":4.75, "y":2},
+        {"matrix": [3, 6], "x": 2.75, "y": 2},
-        {"label":"G", "x":5.75, "y":2},
+        {"matrix": [3, 7], "x": 3.75, "y": 2},
-        {"label":"H", "x":6.75, "y":2},
+        {"matrix": [4, 0], "x": 4.75, "y": 2},
-        {"label":"J", "x":7.75, "y":2},
+        {"matrix": [4, 1], "x": 5.75, "y": 2},
-        {"label":"K", "x":8.75, "y":2},
+        {"matrix": [4, 2], "x": 6.75, "y": 2},
-        {"label":"L", "x":9.75, "y":2},
+        {"matrix": [4, 3], "x": 7.75, "y": 2},
-        {"label":";", "x":10.75, "y":2},
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
-        {"label":"'", "x":11.75, "y":2},
+        {"matrix": [4, 5], "x": 9.75, "y": 2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [4, 6], "x": 10.75, "y": 2},
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
+        {"matrix": [4, 7], "x": 11.75, "y": 2},
-        {"label":"Z", "x":2.25, "y":3},
+        {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
+        {"matrix": [5, 1], "x": 0, "y": 3, "w": 2.25},
-        {"label":"V", "x":5.25, "y":3},
+        {"matrix": [5, 2], "x": 2.25, "y": 3},
-        {"label":"B", "x":6.25, "y":3},
+        {"matrix": [5, 3], "x": 3.25, "y": 3},
-        {"label":"N", "x":7.25, "y":3},
+        {"matrix": [5, 4], "x": 4.25, "y": 3},
-        {"label":"M", "x":8.25, "y":3},
+        {"matrix": [5, 5], "x": 5.25, "y": 3},
-        {"label":",", "x":9.25, "y":3},
+        {"matrix": [5, 6], "x": 6.25, "y": 3},
-        {"label":".", "x":10.25, "y":3},
+        {"matrix": [5, 7], "x": 7.25, "y": 3},
-        {"label":"/", "x":11.25, "y":3},
+        {"matrix": [6, 0], "x": 8.25, "y": 3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"matrix": [6, 1], "x": 9.25, "y": 3},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+        {"matrix": [6, 2], "x": 10.25, "y": 3},
-        {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+        {"matrix": [6, 3], "x": 11.25, "y": 3},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+        {"matrix": [6, 4], "x": 12.25, "y": 3, "w": 2.75},
-        {"label":"Space", "x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
+        {"matrix": [6, 5], "x": 0, "y": 4, "w": 1.25},
-        {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+        {"matrix": [6, 6], "x": 1.25, "y": 4, "w": 1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+        {"matrix": [6, 7], "x": 2.5, "y": 4, "w": 1.25},
-        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [7, 0], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [7, 1], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [7, 2], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [7, 3], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [7, 4], "x": 13.75, "y": 4, "w": 1.25}
      ]
    }
  }
diff --git a/keyboards/40percentclub/luddite/luddite.h b/keyboards/40percentclub/luddite/luddite.h
deleted file mode 100644
index 5b8b95fea4..0000000000
--- a/keyboards/40percentclub/luddite/luddite.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-    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\
-) { \
-        { 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 }, \
-}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index 9470d0ffe3..e961253a23 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -21,7 +21,74 @@
    "community_layouts": ["60_iso"],
    "layouts": {
        "LAYOUT_60_iso": {
-            "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}
+            ]
        }
    }
 }
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.h b/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
index d1cd6a35d4..2f4fa7531a 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
@@ -21,23 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CAPS_LED_GROUP LED_FLAG_INDICATOR // change what leds to target, for example LED_FLAG_KEYLIGHT for alpas or LED_FLAG_MODIFIER for modifiers
 #include "quantum.h"
-#define LAYOUT_60_iso( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k36, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,      \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k86,\
-    k80, k90, k81,                k83, k93,      k94, k85, k95  \
-) \
-{ \
-    {k00, k01, k02, k03, k04, k05, k06}, \
-    {k10, k11, k12, k13, k14, k15, KC_NO}, \
-    {k20, k21, k22, k23, k24, k25, k26}, \
-    {k30, k31, k32, k33, k34, k35, k36}, \
-    {k40, k41, k42, k43, k44, k45, k46}, \
-    {k50, k51, k52, k53, k54, k55, KC_NO}, \
-    {k60, k61, k62, k63, k64, k65, KC_NO}, \
-    {k70, k71, k72, k73, k74, k75, k76}, \
-    {k80, k81, KC_NO, k83, KC_NO, k85, k86}, \
-    {k90, KC_NO, KC_NO, k93, k94, k95, KC_NO}  \
-}
diff --git a/keyboards/bt66tech/bt66tech60/bt66tech60.h b/keyboards/bt66tech/bt66tech60/bt66tech60.h
deleted file mode 100644
index 68db70b00f..0000000000
--- a/keyboards/bt66tech/bt66tech60/bt66tech60.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 bt66tech
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_60_ansi( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-        K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3D, \
-        K40, K41, K42,             K45,                   K49, K4A, K4B, K4D  \
-) { \
-        { K00,  K01,  K02,  K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D }, \
-        { K10,  K11,  K12,  K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D }, \
-        { K20,  K21,  K22,  K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D }, \
-        { K30,  K31,  K32,  K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, KC_NO, K3D }, \
-        { K40,  K41,  K42,  KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D }  \
-}
diff --git a/keyboards/bt66tech/bt66tech60/info.json b/keyboards/bt66tech/bt66tech60/info.json
index 4999eab168..75ab70164a 100644
--- a/keyboards/bt66tech/bt66tech60/info.json
+++ b/keyboards/bt66tech/bt66tech60/info.json
@@ -27,9 +27,73 @@
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
-"layout": [
+            "layout": [
-{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
-              ]
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
    }
-  }
 }
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index 7b3384a0fb..a1313242fa 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -28,67 +28,71 @@
  "layouts": {
    "LAYOUT_60_ansi": {
      "layout": [
-        {"label":"`", "x":0, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"label":"1", "x":1, "y":0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"label":"2", "x":2, "y":0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"label":"3", "x":3, "y":0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"label":"4", "x":4, "y":0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"label":"5", "x":5, "y":0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"label":"6", "x":6, "y":0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"label":"7", "x":7, "y":0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"label":"8", "x":8, "y":0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"label":"9", "x":9, "y":0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"label":"0", "x":10, "y":0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"label":"-", "x":11, "y":0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"label":"=", "x":12, "y":0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"label":"W", "x":2.5, "y":1},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"label":"E", "x":3.5, "y":1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"label":"R", "x":4.5, "y":1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"label":"T", "x":5.5, "y":1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"label":"Y", "x":6.5, "y":1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"label":"U", "x":7.5, "y":1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"label":"I", "x":8.5, "y":1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"label":"O", "x":9.5, "y":1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"label":"P", "x":10.5, "y":1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"label":"[", "x":11.5, "y":1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"label":"]", "x":12.5, "y":1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"label":"\\", "x":13.5, "y":1, "w":1.5},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"label":"D", "x":3.75, "y":2},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"label":"F", "x":4.75, "y":2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"label":"G", "x":5.75, "y":2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"label":"H", "x":6.75, "y":2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"label":"J", "x":7.75, "y":2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"label":"K", "x":8.75, "y":2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"label":"L", "x":9.75, "y":2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"label":";", "x":10.75, "y":2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"label":"'", "x":11.75, "y":2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"label":"Shift", "x":0, "y":3, "w":2.25},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"label":"Z", "x":2.25, "y":3},
+        {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-        {"label":"X", "x":3.25, "y":3},
-        {"label":"C", "x":4.25, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {"label":"V", "x":5.25, "y":3},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
-        {"label":"B", "x":6.25, "y":3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
-        {"label":"N", "x":7.25, "y":3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
-        {"label":"M", "x":8.25, "y":3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
-        {"label":",", "x":9.25, "y":3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
-        {"label":".", "x":10.25, "y":3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
-        {"label":"/", "x":11.25, "y":3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
-        {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+        {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
-        {"label":"Space", "x":3.75, "y":4, "w":6.25},
-        {"label":"Alt", "x":10, "y":4, "w":1.25},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
      ]
    }
  }
diff --git a/keyboards/cannonkeys/practice60/practice60.h b/keyboards/cannonkeys/practice60/practice60.h
deleted file mode 100644
index 5ebba8fb84..0000000000
--- a/keyboards/cannonkeys/practice60/practice60.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-  K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,     K2C, \
-  K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,        K3B, \
-  K40,  K41,  K42,              K43,             K49,  K4A,  K4B,  K4C \
-) { \
-  {  K00,  K01,  K02,  K03,  K04,    K05,    K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,    K0D    }, \
-  {  K10,  K11,  K12,  K13,  K14,    K15,    K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,    K1D    }, \
-  {  K20,  K21,  K22,  K23,  K24,    K25,    K26,    K27,    K28,    K29,  K2A,  K2B,  K2C,    KC_NO  }, \
-  {  K30,  K31,  K32,  K33,  K34,    K35,    K36,    K37,    K38,    K39,  K3A,  K3B,  KC_NO,  KC_NO  }, \
-  {  K40,  K41,  K42,  K43,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  K49,  K4A,  K4B,  K4C,    KC_NO  }  \
-}
diff --git a/keyboards/clawsome/coupe/coupe.h b/keyboards/clawsome/coupe/coupe.h
deleted file mode 100644
index 360dbb24f2..0000000000
--- a/keyboards/clawsome/coupe/coupe.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,        \
-    K20,   K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      \
-    K40,    K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56,          \
-    K60,       K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76,            \
-    K80,  K90,  K81,              K83,                K85,  K95,  K86,  K96      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76   }, \
-    { K80,   K81,   KC_NO, K83,   KC_NO, K85,   K86   }, \
-    { K90,   KC_NO, KC_NO, KC_NO, KC_NO, K95,   K96   }, \
-}
diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json
index 7bbc577308..b68fa51029 100644
--- a/keyboards/clawsome/coupe/info.json
+++ b/keyboards/clawsome/coupe/info.json
@@ -19,67 +19,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"label":"K00 (D7,F4)", "x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"label":"K10 (D2,F4)", "x":1, "y":0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"label":"K01 (D7,F5)", "x":2, "y":0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"label":"K11 (D2,F5)", "x":3, "y":0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"label":"K02 (D7,F6)", "x":4, "y":0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"label":"K12 (D2,F6)", "x":5, "y":0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"label":"K03 (D7,F7)", "x":6, "y":0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"label":"K13 (D2,F7)", "x":7, "y":0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"label":"K04 (D7,B6)", "x":8, "y":0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"label":"K14 (D2,B6)", "x":9, "y":0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"label":"K05 (D7,B3)", "x":10, "y":0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"label":"K15 (D2,B3)", "x":11, "y":0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"label":"K06 (D7,B2)", "x":12, "y":0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"label":"K16 (D2,B2)", "x":13, "y":0, "w":2},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
-                {"label":"K20 (C6,F4)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (B5,F4)", "x":1.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label":"K21 (C6,F5)", "x":2.5, "y":1},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"label":"K31 (B5,F5)", "x":3.5, "y":1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"label":"K22 (C6,F6)", "x":4.5, "y":1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"label":"K32 (B5,F6)", "x":5.5, "y":1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"label":"K23 (C6,F7)", "x":6.5, "y":1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"label":"K33 (B5,F7)", "x":7.5, "y":1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"label":"K24 (C6,B6)", "x":8.5, "y":1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"label":"K34 (B5,B6)", "x":9.5, "y":1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"label":"K25 (C6,B3)", "x":10.5, "y":1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"label":"K35 (B5,B3)", "x":11.5, "y":1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"label":"K26 (C6,B2)", "x":12.5, "y":1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"label":"K36 (B5,B2)", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"label":"K40 (D4,F4)", "x":0, "y":2, "w":1.75},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-                {"label":"K50 (B4,F4)", "x":1.75, "y":2},
-                {"label":"K41 (D4,F5)", "x":2.75, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label":"K51 (B4,F5)", "x":3.75, "y":2},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
-                {"label":"K42 (D4,F6)", "x":4.75, "y":2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
-                {"label":"K52 (B4,F6)", "x":5.75, "y":2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
-                {"label":"K43 (D4,F7)", "x":6.75, "y":2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
-                {"label":"K53 (B4,F7)", "x":7.75, "y":2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
-                {"label":"K44 (D4,B6)", "x":8.75, "y":2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
-                {"label":"K54 (B4,B6)", "x":9.75, "y":2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
-                {"label":"K45 (D4,B3)", "x":10.75, "y":2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
-                {"label":"K55 (B4,B3)", "x":11.75, "y":2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
-                {"label":"K56 (B4,B2)", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
-                {"label":"K60 (D0,F4)", "x":0, "y":3, "w":2.25},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
-                {"label":"K61 (D0,F5)", "x":2.25, "y":3},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-                {"label":"K71 (D3,F5)", "x":3.25, "y":3},
-                {"label":"K62 (D0,F6)", "x":4.25, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label":"K72 (D3,F6)", "x":5.25, "y":3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"label":"K63 (D0,F7)", "x":6.25, "y":3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"label":"K73 (D3,F7)", "x":7.25, "y":3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"label":"K64 (D0,B6)", "x":8.25, "y":3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"label":"K74 (D3,B6)", "x":9.25, "y":3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"label":"K65 (D0,B3)", "x":10.25, "y":3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"label":"K75 (D3,B3)", "x":11.25, "y":3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"label":"K76 (D3,B2)", "x":12.25, "y":3, "w":2.75},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"label":"K80 (D1,F4)", "x":0, "y":4, "w":1.25},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"label":"K90 (E6,F4)", "x":1.25, "y":4, "w":1.25},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"label":"K81 (D1,F5)", "x":2.5, "y":4, "w":1.25},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 2.75},
-                {"label":"K83 (D1,F7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K85 (D1,B3)", "x":10, "y":4, "w":1.25},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label":"K95 (E6,B3)", "x":11.25, "y":4, "w":1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"K86 (D1,B2)", "x":12.5, "y":4, "w":1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"K96 (E6,B2)", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/durgod/dgk6x/dgk6x.h b/keyboards/durgod/dgk6x/dgk6x.h
index 3f020d01e0..38de12a435 100644
--- a/keyboards/durgod/dgk6x/dgk6x.h
+++ b/keyboards/durgod/dgk6x/dgk6x.h
@@ -17,10 +17,6 @@
 #include "quantum.h"
-#if defined KEYBOARD_durgod_dgk6x_venus
-#   include "venus.h"
-#endif
 /* Function Prototype */
 void off_all_leds(void);
 void on_all_leds(void);
diff --git a/keyboards/durgod/dgk6x/venus/info.json b/keyboards/durgod/dgk6x/venus/info.json
index b7ee00bc8d..cc7b321e23 100644
--- a/keyboards/durgod/dgk6x/venus/info.json
+++ b/keyboards/durgod/dgk6x/venus/info.json
@@ -14,75 +14,75 @@
  },
  "diode_direction": "ROW2COL",
  "community_layouts": ["60_ansi"],
-    "layouts": {
+  "layouts": {
-        "LAYOUT_60_ansi": {
+    "LAYOUT_60_ansi": {
-            "layout": [
+      "layout": [
-                {"label":"Esc", "x":0, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
-                {"label":"!", "x":1, "y":0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
-                {"label":"@", "x":2, "y":0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
-                {"label":"#", "x":3, "y":0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
-                {"label":"$", "x":4, "y":0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
-                {"label":"%", "x":5, "y":0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
-                {"label":"^", "x":6, "y":0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
-                {"label":"&", "x":7, "y":0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
-                {"label":"*", "x":8, "y":0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
-                {"label":"(", "x":9, "y":0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
-                {"label":")", "x":10, "y":0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
-                {"label":"_", "x":11, "y":0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
-                {"label":"+", "x":12, "y":0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label":"Q", "x":1.5, "y":1},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label":"W", "x":2.5, "y":1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label":"E", "x":3.5, "y":1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label":"R", "x":4.5, "y":1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label":"T", "x":5.5, "y":1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label":"Y", "x":6.5, "y":1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label":"U", "x":7.5, "y":1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label":"I", "x":8.5, "y":1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label":"O", "x":9.5, "y":1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label":"P", "x":10.5, "y":1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label":"{", "x":11.5, "y":1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label":"}", "x":12.5, "y":1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label":"CapsLock", "x":0, "y":2, "w":1.75},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label":"A", "x":1.75, "y":2},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label":"S", "x":2.75, "y":2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label":"D", "x":3.75, "y":2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label":"F", "x":4.75, "y":2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label":"G", "x":5.75, "y":2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label":"H", "x":6.75, "y":2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label":"J", "x":7.75, "y":2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label":"K", "x":8.75, "y":2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label":"L", "x":9.75, "y":2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label":";", "x":10.75, "y":2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label":"'", "x":11.75, "y":2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label":"Z", "x":2.25, "y":3},
+        {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label":"X", "x":3.25, "y":3},
+        {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label":"C", "x":4.25, "y":3},
+        {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label":"V", "x":5.25, "y":3},
+        {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label":"B", "x":6.25, "y":3},
+        {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label":"N", "x":7.25, "y":3},
+        {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"label":"M", "x":8.25, "y":3},
+        {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"label":"<", "x":9.25, "y":3},
+        {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"label":">", "x":10.25, "y":3},
+        {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"label":"?", "x":11.25, "y":3},
+        {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label":"Gui", "x":1.25, "y":4, "w":1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label":" ", "x":3.75, "y":4, "w":6.25},
+        {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
+        {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"label":"Gui", "x":11.25, "y":4, "w":1.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"Win", "x":12.5, "y":4, "w":1.25},
+        {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
-            ]
+      ]
-        }
    }
+  }
 }
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 1f26191a91..8c5ba712b1 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "venus.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/durgod/dgk6x/venus/venus.h b/keyboards/durgod/dgk6x/venus/venus.h
deleted file mode 100644
index 7d1635b777..0000000000
--- a/keyboards/durgod/dgk6x/venus/venus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 Jessica Sullivan and Don Kjer 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_60_ansi( \
-      K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D, \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,        K2D, \
-      K30,        K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,        K3B, \
-      K40,  K41,  K42,                    K45,                    K49,  K4A,  K4B,  K4C  \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D }, \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D }, \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  XXX,  K2D }, \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  XXX }, \
-    { K40,  K41,  K42,  XXX,  XXX,  K45,  XXX,  XXX,  XXX,  K49,  K4A,  K4B,  K4C,  XXX }, \
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index 475c9cc4b5..b607a58a4e 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -1,4 +1,4 @@
-#include "dz60rgb_ansi.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
deleted file mode 100644
index e522c482c2..0000000000
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
-    K40, K41, K42,                K45,                K49, K4A, K4B, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D }  \
-}
diff --git a/keyboards/dztech/dz60rgb_ansi/info.json b/keyboards/dztech/dz60rgb_ansi/info.json
index e3521ed88b..12fefa5d87 100644
--- a/keyboards/dztech/dz60rgb_ansi/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/info.json
@@ -10,71 +10,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x":10, "y":4, "w":1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 5ee8d1b531..5a55bacefc 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -1,4 +1,4 @@
-#include "dz60rgb_wkl.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
deleted file mode 100644
index 5f47903fc8..0000000000
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_tsangan_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
-    K40, K41, K42,                K45,                     K4A, K4B, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D }  \
-}
-#define LAYOUT_HHKB LAYOUT_60_tsangan_hhkb
diff --git a/keyboards/dztech/dz60rgb_wkl/info.json b/keyboards/dztech/dz60rgb_wkl/info.json
index 76199d5532..52685db180 100644
--- a/keyboards/dztech/dz60rgb_wkl/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/info.json
@@ -7,75 +7,78 @@
        "vid": "0x445A"
    },
    "community_layouts": ["60_tsangan_hhkb"],
+    "layout_aliases": {
+        "LAYOUT_HHKB": "LAYOUT_60_tsangan_hhkb"
+    },
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"x":14, "y":0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3, "w":1.75},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"x":14, "y":3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"x":0, "y":4, "w":1.5},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"x":1.5, "y":4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"x":2.5, "y":4, "w":1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"x":4, "y":4, "w":7},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                {"x":11, "y":4, "w":1.5},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"x":12.5, "y":4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
-                {"x":13.5, "y":4, "w":1.5}
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }
diff --git a/keyboards/ekow/akira/akira.h b/keyboards/ekow/akira/akira.h
deleted file mode 100644
index 0417458027..0000000000
--- a/keyboards/ekow/akira/akira.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 eugenepy
- *
- * 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_60_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-         K41, K42,                     K47,                K4B, K4C       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D , K0E}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D , XXX}, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, XXX}, \
-    { K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D , XXX, XXX}, \
-    { K41, K42, XXX, XXX, XXX, K47, XXX, XXX, XXX, XXX, K4B, K4C, XXX, XXX, XXX}  \
-}
diff --git a/keyboards/ekow/akira/info.json b/keyboards/ekow/akira/info.json
index 0418dca8c6..804f5c091d 100644
--- a/keyboards/ekow/akira/info.json
+++ b/keyboards/ekow/akira/info.json
@@ -16,317 +16,73 @@
    "processor": "STM32F042",
    "bootloader": "stm32-dfu",
    "debounce": 3,
-    "layouts": {
+     "layouts": {
        "LAYOUT_60_hhkb": {
            "layout": [
-                {
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                    "label": "Esc",
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                    "x": 0,
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                    "y": 0
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                },
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                    "label": "!",
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                    "x": 1,
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                    "y": 0
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                },
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                    "label": "@",
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                    "x": 2,
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                    "y": 0
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                },
+                {"matrix": [0, 14], "x": 14, "y": 0},
-                {
-                    "label": "#",
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                    "x": 3,
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                    "y": 0
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                },
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                    "label": "$",
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                    "x": 4,
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                    "y": 0
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                },
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                    "label": "%",
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                    "x": 5,
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                    "y": 0
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                },
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {
-                    "label": "^",
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                    "x": 6,
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                    "y": 0
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                },
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                    "label": "&",
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                    "x": 7,
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                    "y": 0
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                },
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                    "label": "*",
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                    "x": 8,
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                    "y": 0
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                },
-                {
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                    "label": "(",
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                    "x": 9,
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                    "y": 0
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                },
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                    "label": ")",
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                    "x": 10,
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                    "y": 0
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                },
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                    "label": "_",
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                    "x": 11,
+                {"matrix": [3, 12], "x": 14, "y": 3},
-                    "y": 0
-                },
+                {"matrix": [4, 0], "x": 1.5, "y": 4},
-                {
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5},
-                    "label": "+",
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                    "x": 12,
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                    "y": 0
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
-                },
-                {
-                    "label": "|",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "~",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "Delete",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Control",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "Fn",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "Os",
-                    "x": 1.5,
-                    "y": 4
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "x": 4,
-                    "y": 4,
-                    "w": 7
-                },
-                {
-                    "label": "Alt",
-                    "x": 11,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "Os",
-                    "x": 12.5,
-                    "y": 4
-                }
            ]
        }
    }
diff --git a/keyboards/fjlabs/mk61rgbansi/info.json b/keyboards/fjlabs/mk61rgbansi/info.json
index a05a01cb9e..7872f39654 100644
--- a/keyboards/fjlabs/mk61rgbansi/info.json
+++ b/keyboards/fjlabs/mk61rgbansi/info.json
@@ -22,71 +22,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-                
-                {"x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h b/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h
deleted file mode 100644
index 8ab4873e08..0000000000
--- a/keyboards/fjlabs/mk61rgbansi/mk61rgbansi.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-/* MK61-RGB-ANSI Keymap Definitions */
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D   }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D   }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D   }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   KC_NO }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D   }  \
-}
diff --git a/keyboards/fjlabs/tf60ansi/info.json b/keyboards/fjlabs/tf60ansi/info.json
index 02c089926f..c43710dfd0 100644
--- a/keyboards/fjlabs/tf60ansi/info.json
+++ b/keyboards/fjlabs/tf60ansi/info.json
@@ -22,71 +22,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-                
-                {"x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/fjlabs/tf60ansi/tf60ansi.h b/keyboards/fjlabs/tf60ansi/tf60ansi.h
deleted file mode 100644
index bafc28891d..0000000000
--- a/keyboards/fjlabs/tf60ansi/tf60ansi.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 <me@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-/* TF60 ANSI Keymap Definitions */
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D   }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D   }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D   }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   KC_NO }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D   }  \
-}
diff --git a/keyboards/foxlab/leaf60/hotswap/hotswap.h b/keyboards/foxlab/leaf60/hotswap/hotswap.h
deleted file mode 100644
index eaf0b2d3ae..0000000000
--- a/keyboards/foxlab/leaf60/hotswap/hotswap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 Fox Lab
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_60_tsangan_hhkb( \
-        K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
-        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             \
-        K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
-        K400, K401, K402,                         K407,                   K411, K412, K413  \
-) { \
-        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-        { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO }, \
-        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, KC_NO }, \
-        { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO }, \
-        { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, KC_NO, K411,  K412,  K413,  KC_NO }  \
-}
diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json
index 487bf007eb..75a8080402 100644
--- a/keyboards/foxlab/leaf60/hotswap/info.json
+++ b/keyboards/foxlab/leaf60/hotswap/info.json
@@ -29,7 +29,74 @@
    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
-            "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":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":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":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
        }
    }
 }
diff --git a/keyboards/handwired/fruity60/fruity60.h b/keyboards/handwired/fruity60/fruity60.h
deleted file mode 100644
index 7eb2e7e6fd..0000000000
--- a/keyboards/handwired/fruity60/fruity60.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 Yan-Fa Li
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_60_tsangan_hhkb( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k50, k51, k52, k53, \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k54, k55, k56, \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k57, k58, \
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k59, k5a, \
-        k40, k41, k42, k45, k48, k49, k4a \
-        ) \
-    { \
-      {k00, k01, k02, k03,   k04,   k05, k06,   k07,   k08, k09, k0a}, \
-      {k10, k11, k12, k13,   k14,   k15, k16,   k17,   k18, k19, k1a}, \
-      {k20, k21, k22, k23,   k24,   k25, k26,   k27,   k28, k29, k2a}, \
-      {k30, k31, k32, k33,   k34,   k35, k36,   k37,   k38, k39, k3a}, \
-      {k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a}, \
-      {k50, k51, k52, k53,   k54,   k55, k56,   k57,   k58, k59, k5a}, \
-    }
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json
index fdfc177264..dab7f609a8 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/info.json
@@ -18,7 +18,74 @@
    "community_layouts": ["60_tsangan_hhkb"],
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [5, 0], "x": 11, "y": 0},
+                {"matrix": [5, 1], "x": 12, "y": 0},
+                {"matrix": [5, 2], "x": 13, "y": 0},
+                {"matrix": [5, 3], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [5, 4], "x": 11.5, "y": 1},
+                {"matrix": [5, 5], "x": 12.5, "y": 1},
+                {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [5, 7], "x": 11.75, "y": 2},
+                {"matrix": [5, 8], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [5, 9], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [5, 10], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 9], "x": 12.5, "y": 4},
+                {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5}
+            ]
        }
    }
 }
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index dc465cea96..bfff105e90 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -18,66 +18,70 @@
  "layouts": {
    "LAYOUT_60_hhkb": {
      "layout": [
-        { "label": "Esc", "x": 0, "y": 0 },
+        {"matrix": [3, 1], "x": 0, "y": 0},
-        { "label": "!", "x": 1, "y": 0 },
+        {"matrix": [3, 0], "x": 1, "y": 0},
-        { "label": "@", "x": 2, "y": 0 },
+        {"matrix": [0, 0], "x": 2, "y": 0},
-        { "label": "#", "x": 3, "y": 0 },
+        {"matrix": [1, 0], "x": 3, "y": 0},
-        { "label": "$", "x": 4, "y": 0 },
+        {"matrix": [1, 1], "x": 4, "y": 0},
-        { "label": "%", "x": 5, "y": 0 },
+        {"matrix": [2, 0], "x": 5, "y": 0},
-        { "label": "^", "x": 6, "y": 0 },
+        {"matrix": [2, 1], "x": 6, "y": 0},
-        { "label": "&", "x": 7, "y": 0 },
+        {"matrix": [4, 0], "x": 7, "y": 0},
-        { "label": "*", "x": 8, "y": 0 },
+        {"matrix": [4, 1], "x": 8, "y": 0},
-        { "label": "(", "x": 9, "y": 0 },
+        {"matrix": [6, 0], "x": 9, "y": 0},
-        { "label": ")", "x": 10, "y": 0 },
+        {"matrix": [6, 1], "x": 10, "y": 0},
-        { "label": "_", "x": 11, "y": 0 },
+        {"matrix": [7, 0], "x": 11, "y": 0},
-        { "label": "+", "x": 12, "y": 0 },
+        {"matrix": [7, 1], "x": 12, "y": 0},
-        { "label": "|", "x": 13, "y": 0 },
+        {"matrix": [5, 0], "x": 13, "y": 0},
-        { "label": "~", "x": 14, "y": 0 },
+        {"matrix": [5, 1], "x": 14, "y": 0},
-        { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 1 },
+        {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
-        { "label": "W", "x": 2.5, "y": 1 },
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
-        { "label": "E", "x": 3.5, "y": 1 },
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
-        { "label": "R", "x": 4.5, "y": 1 },
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        { "label": "T", "x": 5.5, "y": 1 },
+        {"matrix": [1, 2], "x": 4.5, "y": 1},
-        { "label": "Y", "x": 6.5, "y": 1 },
+        {"matrix": [2, 3], "x": 5.5, "y": 1},
-        { "label": "U", "x": 7.5, "y": 1 },
+        {"matrix": [2, 2], "x": 6.5, "y": 1},
-        { "label": "I", "x": 8.5, "y": 1 },
+        {"matrix": [4, 2], "x": 7.5, "y": 1},
-        { "label": "O", "x": 9.5, "y": 1 },
+        {"matrix": [4, 3], "x": 8.5, "y": 1},
-        { "label": "P", "x": 10.5, "y": 1 },
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
-        { "label": "{", "x": 11.5, "y": 1 },
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
-        { "label": "}", "x": 12.5, "y": 1 },
+        {"matrix": [7, 3], "x": 11.5, "y": 1},
-        { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 },
+        {"matrix": [7, 2], "x": 12.5, "y": 1},
-        { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
+        {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
-        { "label": "A", "x": 1.75, "y": 2 },
-        { "label": "S", "x": 2.75, "y": 2 },
+        {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
-        { "label": "D", "x": 3.75, "y": 2 },
+        {"matrix": [0, 4], "x": 1.75, "y": 2},
-        { "label": "F", "x": 4.75, "y": 2 },
+        {"matrix": [0, 3], "x": 2.75, "y": 2},
-        { "label": "G", "x": 5.75, "y": 2 },
+        {"matrix": [1, 4], "x": 3.75, "y": 2},
-        { "label": "H", "x": 6.75, "y": 2 },
+        {"matrix": [1, 5], "x": 4.75, "y": 2},
-        { "label": "J", "x": 7.75, "y": 2 },
+        {"matrix": [2, 4], "x": 5.75, "y": 2},
-        { "label": "K", "x": 8.75, "y": 2 },
+        {"matrix": [2, 5], "x": 6.75, "y": 2},
-        { "label": "L", "x": 9.75, "y": 2 },
+        {"matrix": [4, 5], "x": 7.75, "y": 2},
-        { "label": ":", "x": 10.75, "y": 2 },
+        {"matrix": [4, 4], "x": 8.75, "y": 2},
-        { "label": "\"", "x": 11.75, "y": 2 },
+        {"matrix": [6, 5], "x": 9.75, "y": 2},
-        { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
+        {"matrix": [6, 4], "x": 10.75, "y": 2},
-        { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
-        { "label": "Z", "x": 2.25, "y": 3 },
+        {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
-        { "label": "X", "x": 3.25, "y": 3 },
-        { "label": "C", "x": 4.25, "y": 3 },
+        {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
-        { "label": "V", "x": 5.25, "y": 3 },
+        {"matrix": [0, 5], "x": 2.25, "y": 3},
-        { "label": "B", "x": 6.25, "y": 3 },
+        {"matrix": [0, 6], "x": 3.25, "y": 3},
-        { "label": "N", "x": 7.25, "y": 3 },
+        {"matrix": [0, 7], "x": 4.25, "y": 3},
-        { "label": "M", "x": 8.25, "y": 3 },
+        {"matrix": [1, 6], "x": 5.25, "y": 3},
-        { "label": "<", "x": 9.25, "y": 3 },
+        {"matrix": [1, 7], "x": 6.25, "y": 3},
-        { "label": ">", "x": 10.25, "y": 3 },
+        {"matrix": [2, 6], "x": 7.25, "y": 3},
-        { "label": "?", "x": 11.25, "y": 3 },
+        {"matrix": [4, 6], "x": 8.25, "y": 3},
-        { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+        {"matrix": [6, 6], "x": 9.25, "y": 3},
-        { "label": "Fn", "x": 14, "y": 3 },
+        {"matrix": [7, 6], "x": 10.25, "y": 3},
-        { "label": "", "x": 1.5, "y": 4 },
+        {"matrix": [7, 5], "x": 11.25, "y": 3},
-        { "label": "", "x": 2.5, "y": 4, "w": 1.5 },
+        {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
-        { "x": 4, "y": 4, "w": 6 },
+        {"matrix": [5, 4], "x": 14, "y": 3},
-        { "label": "", "x": 10, "y": 4, "w": 1.5 },
-        { "label": "", "x": 11.5, "y": 4 }
+        {"matrix": [3, 5], "x": 1.5, "y": 4},
+        {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+        {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+        {"matrix": [5, 6], "x": 11.5, "y": 4}
      ]
    }
  }
diff --git a/keyboards/hhkb/yang/yang.c b/keyboards/hhkb/yang/yang.c
index 7ae0d76390..548f0dd734 100644
--- a/keyboards/hhkb/yang/yang.c
+++ b/keyboards/hhkb/yang/yang.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "yang.h"
+#include "quantum.h"
 extern uint8_t power_save_level;
diff --git a/keyboards/hhkb/yang/yang.h b/keyboards/hhkb/yang/yang.h
deleted file mode 100644
index 4858c18554..0000000000
--- a/keyboards/hhkb/yang/yang.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Kan-Ru Chen <kanru@kanru.info>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_hhkb(                                                        \
-    K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
-    K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52,      \
-    K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53,           \
-    K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54,           \
-         K35, K36,           K37,                K57, K56)                     \
-                                                                               \
-{                                                                              \
-    { K00, K01, K02, K03, K04, K05, K06, K07   },                              \
-    { K10, K11, K12, K13, K14, K15, K16, K17   },                              \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO },                              \
-    { K30, K31, K32, K33, K34, K35, K36, K37   },                              \
-    { K40, K41, K42, K43, K44, K45, K46, KC_NO },                              \
-    { K50, K51, K52, K53, K54, K55, K56, K57   },                              \
-    { K60, K61, K62, K63, K64, K65, K66, KC_NO },                              \
-    { K70, K71, K72, K73, K74, K75, K76, KC_NO }                               \
-}
diff --git a/keyboards/hs60/v2/ansi/ansi.h b/keyboards/hs60/v2/ansi/ansi.h
index e29cc65c0e..d7296c38c1 100644
--- a/keyboards/hs60/v2/ansi/ansi.h
+++ b/keyboards/hs60/v2/ansi/ansi.h
@@ -15,24 +15,6 @@
 */
 #pragma once
-#define XXX KC_NO
 #include "quantum.h"
 #include "../../wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
index f492c08553..0debcea8d1 100644
--- a/keyboards/hs60/v2/ansi/info.json
+++ b/keyboards/hs60/v2/ansi/info.json
@@ -20,325 +20,71 @@
  "layouts": {
    "LAYOUT_60_ansi": {
      "layout": [
-        {
+        {"matrix": [0, 0], "x": 0, "y": 0},
-          "label": "~",
+        {"matrix": [0, 1], "x": 1, "y": 0},
-          "x": 0,
+        {"matrix": [0, 2], "x": 2, "y": 0},
-          "y": 0
+        {"matrix": [0, 3], "x": 3, "y": 0},
-        },
+        {"matrix": [0, 4], "x": 4, "y": 0},
-        {
+        {"matrix": [0, 5], "x": 5, "y": 0},
-          "label": "!",
+        {"matrix": [0, 6], "x": 6, "y": 0},
-          "x": 1,
+        {"matrix": [0, 7], "x": 7, "y": 0},
-          "y": 0
+        {"matrix": [0, 8], "x": 8, "y": 0},
-        },
+        {"matrix": [0, 9], "x": 9, "y": 0},
-        {
+        {"matrix": [0, 10], "x": 10, "y": 0},
-          "label": "@",
+        {"matrix": [0, 11], "x": 11, "y": 0},
-          "x": 2,
+        {"matrix": [0, 12], "x": 12, "y": 0},
-          "y": 0
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        },
-        {
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-          "label": "#",
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
-          "x": 3,
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
-          "y": 0
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        },
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
-          "label": "$",
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
-          "x": 4,
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
-          "y": 0
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        },
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
-          "label": "%",
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
-          "x": 5,
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
-          "y": 0
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
-        },
-        {
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-          "label": "^",
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
-          "x": 6,
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
-          "y": 0
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        },
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
-          "label": "&",
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
-          "x": 7,
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
-          "y": 0
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        },
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
-          "label": "*",
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
-          "x": 8,
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-          "y": 0
-        },
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-        {
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
-          "label": "(",
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
-          "x": 9,
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
-          "y": 0
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        },
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
-          "label": ")",
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
-          "x": 10,
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
-          "y": 0
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        },
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-          "label": "_",
-          "x": 11,
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-          "y": 0
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        },
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-          "label": "+",
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-          "x": 12,
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-          "y": 0
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-        },
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
-        {
-          "label": "Backspace",
-          "x": 13,
-          "y": 0,
-          "w": 2
-        },
-        {
-          "label": "Tab",
-          "x": 0,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Q",
-          "x": 1.5,
-          "y": 1
-        },
-        {
-          "label": "W",
-          "x": 2.5,
-          "y": 1
-        },
-        {
-          "label": "E",
-          "x": 3.5,
-          "y": 1
-        },
-        {
-          "label": "R",
-          "x": 4.5,
-          "y": 1
-        },
-        {
-          "label": "T",
-          "x": 5.5,
-          "y": 1
-        },
-        {
-          "label": "Y",
-          "x": 6.5,
-          "y": 1
-        },
-        {
-          "label": "U",
-          "x": 7.5,
-          "y": 1
-        },
-        {
-          "label": "I",
-          "x": 8.5,
-          "y": 1
-        },
-        {
-          "label": "O",
-          "x": 9.5,
-          "y": 1
-        },
-        {
-          "label": "P",
-          "x": 10.5,
-          "y": 1
-        },
-        {
-          "label": "{",
-          "x": 11.5,
-          "y": 1
-        },
-        {
-          "label": "}",
-          "x": 12.5,
-          "y": 1
-        },
-        {
-          "label": "|",
-          "x": 13.5,
-          "y": 1,
-          "w": 1.5
-        },
-        {
-          "label": "Caps Lock",
-          "x": 0,
-          "y": 2,
-          "w": 1.75
-        },
-        {
-          "label": "A",
-          "x": 1.75,
-          "y": 2
-        },
-        {
-          "label": "S",
-          "x": 2.75,
-          "y": 2
-        },
-        {
-          "label": "D",
-          "x": 3.75,
-          "y": 2
-        },
-        {
-          "label": "F",
-          "x": 4.75,
-          "y": 2
-        },
-        {
-          "label": "G",
-          "x": 5.75,
-          "y": 2
-        },
-        {
-          "label": "H",
-          "x": 6.75,
-          "y": 2
-        },
-        {
-          "label": "J",
-          "x": 7.75,
-          "y": 2
-        },
-        {
-          "label": "K",
-          "x": 8.75,
-          "y": 2
-        },
-        {
-          "label": "L",
-          "x": 9.75,
-          "y": 2
-        },
-        {
-          "label": ":",
-          "x": 10.75,
-          "y": 2
-        },
-        {
-          "label": "\"",
-          "x": 11.75,
-          "y": 2
-        },
-        {
-          "label": "Enter",
-          "x": 12.75,
-          "y": 2,
-          "w": 2.25
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 3,
-          "w": 2.25
-        },
-        {
-          "label": "Z",
-          "x": 2.25,
-          "y": 3
-        },
-        {
-          "label": "X",
-          "x": 3.25,
-          "y": 3
-        },
-        {
-          "label": "C",
-          "x": 4.25,
-          "y": 3
-        },
-        {
-          "label": "V",
-          "x": 5.25,
-          "y": 3
-        },
-        {
-          "label": "B",
-          "x": 6.25,
-          "y": 3
-        },
-        {
-          "label": "N",
-          "x": 7.25,
-          "y": 3
-        },
-        {
-          "label": "M",
-          "x": 8.25,
-          "y": 3
-        },
-        {
-          "label": "<",
-          "x": 9.25,
-          "y": 3
-        },
-        {
-          "label": ">",
-          "x": 10.25,
-          "y": 3
-        },
-        {
-          "label": "?",
-          "x": 11.25,
-          "y": 3
-        },
-        {
-          "label": "Shift",
-          "x": 12.25,
-          "y": 3,
-          "w": 2.75
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 1.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "x": 3.75,
-          "y": 4,
-          "w": 6.25
-        },
-        {
-          "label": "Alt",
-          "x": 10,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Win",
-          "x": 11.25,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Menu",
-          "x": 12.5,
-          "y": 4,
-          "w": 1.25
-        },
-        {
-          "label": "Ctrl",
-          "x": 13.75,
-          "y": 4,
-          "w": 1.25
-        }
      ]
    }
  }
diff --git a/keyboards/hs60/v2/hhkb/hhkb.h b/keyboards/hs60/v2/hhkb/hhkb.h
index 94248f01e0..d7296c38c1 100644
--- a/keyboards/hs60/v2/hhkb/hhkb.h
+++ b/keyboards/hs60/v2/hhkb/hhkb.h
@@ -15,24 +15,6 @@
 */
 #pragma once
-#define XXX KC_NO
 #include "quantum.h"
 #include "../../wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_60_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D,      \
-    K40, K41, K42,                K46,                     K4B, K4C, K4D       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/info.json
index ae6588b2e7..5323fe20f0 100644
--- a/keyboards/hs60/v2/hhkb/info.json
+++ b/keyboards/hs60/v2/hhkb/info.json
@@ -18,7 +18,74 @@
  "board": "QMK_PROTON_C",
  "layouts": {
    "LAYOUT_60_hhkb": {
-        "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":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":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":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [1, 13], "x": 14, "y": 0},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 12.5, "y": 4},
+        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+      ]
    }
  }
 }
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/info.json
index 5b67d85e99..c422ae2d72 100644
--- a/keyboards/hs60/v2/iso/info.json
+++ b/keyboards/hs60/v2/iso/info.json
@@ -20,68 +20,72 @@
  "layouts": {
    "LAYOUT_60_iso": {
      "layout": [
-        {"label":"\\u00ac", "x":0, "y":0},
+        {"matrix": [0, 0], "x": 0, "y": 0},
-        {"label":"!", "x":1, "y":0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
-        {"label":"\"", "x":2, "y":0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
-        {"label":"\\u00a3", "x":3, "y":0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
-        {"label":"$", "x":4, "y":0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
-        {"label":"%", "x":5, "y":0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
-        {"label":"^", "x":6, "y":0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
-        {"label":"&", "x":7, "y":0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"label":"*", "x":8, "y":0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"label":"(", "x":9, "y":0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"label":")", "x":10, "y":0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"label":"_", "x":11, "y":0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"label":"+", "x":12, "y":0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"label":"Backspace", "x":13, "y":0, "w":2},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-        {"label":"W", "x":2.5, "y":1},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
-        {"label":"E", "x":3.5, "y":1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
-        {"label":"R", "x":4.5, "y":1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
-        {"label":"T", "x":5.5, "y":1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
-        {"label":"Y", "x":6.5, "y":1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
-        {"label":"U", "x":7.5, "y":1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
-        {"label":"I", "x":8.5, "y":1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
-        {"label":"O", "x":9.5, "y":1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
-        {"label":"P", "x":10.5, "y":1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
-        {"label":"{", "x":11.5, "y":1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
-        {"label":"}", "x":12.5, "y":1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-        {"label":"D", "x":3.75, "y":2},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
-        {"label":"F", "x":4.75, "y":2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
-        {"label":"G", "x":5.75, "y":2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
-        {"label":"H", "x":6.75, "y":2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
-        {"label":"J", "x":7.75, "y":2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
-        {"label":"K", "x":8.75, "y":2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
-        {"label":"L", "x":9.75, "y":2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
-        {"label":":", "x":10.75, "y":2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
-        {"label":"@", "x":11.75, "y":2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
-        {"label":"~", "x":12.75, "y":2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
-        {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
-        {"label":"Shift", "x":0, "y":3, "w":1.25},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
-        {"label":"|", "x":1.25, "y":3},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-        {"label":"Z", "x":2.25, "y":3},
-        {"label":"X", "x":3.25, "y":3},
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-        {"label":"C", "x":4.25, "y":3},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
-        {"label":"V", "x":5.25, "y":3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
-        {"label":"B", "x":6.25, "y":3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
-        {"label":"N", "x":7.25, "y":3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
-        {"label":"M", "x":8.25, "y":3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
-        {"label":"<", "x":9.25, "y":3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
-        {"label":">", "x":10.25, "y":3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
-        {"label":"?", "x":11.25, "y":3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
-        {"label":"Shift", "x":12.25, "y":3, "w":2.75},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
-        {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
-        {"label":"Win", "x":1.25, "y":4, "w":1.25},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
-        {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+        {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-        {"x":3.75, "y":4, "w":6.25},
-        {"label":"AltGr", "x":10, "y":4, "w":1.25},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-        {"label":"Win", "x":11.25, "y":4, "w":1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-        {"label":"Menu", "x":12.5, "y":4, "w":1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-        {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
      ]
    }
  }
diff --git a/keyboards/hs60/v2/iso/iso.h b/keyboards/hs60/v2/iso/iso.h
index 6a51b7556a..d7296c38c1 100644
--- a/keyboards/hs60/v2/iso/iso.h
+++ b/keyboards/hs60/v2/iso/iso.h
@@ -15,24 +15,6 @@
 */
 #pragma once
-#define XXX KC_NO
 #include "quantum.h"
 #include "../../wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_60_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/inett_studio/sqx/hotswap/hotswap.h b/keyboards/inett_studio/sqx/hotswap/hotswap.h
index b879f7aaaf..ab0d6ec5c8 100644
--- a/keyboards/inett_studio/sqx/hotswap/hotswap.h
+++ b/keyboards/inett_studio/sqx/hotswap/hotswap.h
@@ -20,24 +20,6 @@
 #include "quantum.h"
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT_60_tsangan_hhkb( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40,      k42, k43,                k47,                k49, k4a, k4b       \
-) \
-{ \
-    {k00,   k01, k02,   k03,   k04,   k05, k06, k08,   k09,   k0a,   k0b, k0c,   k0d, k0e}, \
-    {k10,   k11, k12,   k13,   k14,   k15, k16, k17,   k18,   k19,   k1a, k1b,   k1c, k1e}, \
-    {k20,   k22, k23,   k24,   k25,   k26, k27, k28,   k29,   k2a,   k2b, k2c, KC_NO, k2e}, \
-    {k30, KC_NO, k32,   k33,   k34,   k35, k36, k37,   k38,   k39,   k3a, k3b,   k3c, k3d}, \
-    {k40,   k42, k43, KC_NO, KC_NO, KC_NO, k47, k07, KC_NO, KC_NO, KC_NO, k49,   k4a, k4b}  \
-}
 #if defined(RGB_MATRIX_DISABLE_KEYCODES)
 #    ifndef RGB_MATRIX_TOGGLE
 #        define RGB_MATRIX_TOGGLE   KC_F16
diff --git a/keyboards/inett_studio/sqx/hotswap/info.json b/keyboards/inett_studio/sqx/hotswap/info.json
index 02934bcf7c..ae51d4a772 100644
--- a/keyboards/inett_studio/sqx/hotswap/info.json
+++ b/keyboards/inett_studio/sqx/hotswap/info.json
@@ -24,7 +24,74 @@
    "community_layouts": ["60_tsangan_hhkb"],
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
-            "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":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":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":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [4, 7], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+            ]
        }
    }
-  }
+}
diff --git a/keyboards/jm60/info.json b/keyboards/jm60/info.json
index a39bf9b4b4..496637383f 100644
--- a/keyboards/jm60/info.json
+++ b/keyboards/jm60/info.json
@@ -17,71 +17,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/jm60/jm60.c b/keyboards/jm60/jm60.c
index 823892dce9..cffb33d695 100644
--- a/keyboards/jm60/jm60.c
+++ b/keyboards/jm60/jm60.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "jm60.h"
+#include "quantum.h"
 void board_init(void) {
        AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
diff --git a/keyboards/jm60/jm60.h b/keyboards/jm60/jm60.h
deleted file mode 100644
index bea4451a04..0000000000
--- a/keyboards/jm60/jm60.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2014 Jun Wako <wakojun@gmail.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2C,      k2D, \
-    k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B,      k3D, \
-    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, XXX, k2C, k2D }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, XXX, k3D }, \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
-}
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/info.json
index 31972fe773..2bee3b9308 100644
--- a/keyboards/keygem/kg60ansi/info.json
+++ b/keyboards/keygem/kg60ansi/info.json
@@ -22,71 +22,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-                
-                {"x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/keygem/kg60ansi/kg60ansi.h b/keyboards/keygem/kg60ansi/kg60ansi.h
deleted file mode 100644
index 96e78e8d6f..0000000000
--- a/keyboards/keygem/kg60ansi/kg60ansi.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2022 <felix@fjlaboratories.com>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-/* KG60 ANSI Keymap Definitions */
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C,      \
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D  \
-) { \
-    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D   }, \
-    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D   }, \
-    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D   }, \
-    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, KC_NO, K3C,   KC_NO }, \
-    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D   }  \
-}
diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json
index aaff7671b0..ada36466ff 100644
--- a/keyboards/keyten/kt60_m/info.json
+++ b/keyboards/keyten/kt60_m/info.json
@@ -22,74 +22,73 @@
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 14, "y": 0},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
+                {"matrix": [4, 12], "x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
-                
    }
 }
diff --git a/keyboards/keyten/kt60_m/kt60_m.h b/keyboards/keyten/kt60_m/kt60_m.h
deleted file mode 100644
index 1298537543..0000000000
--- a/keyboards/keyten/kt60_m/kt60_m.h
+++ /dev/null
@@ -1,48 +0,0 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * 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
-/* LAYOUT_60_tsangan_hhkb
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │
- * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
- * │40   │41 │42   │46                         │4a   │4c │4d   │
- * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- */
-#define LAYOUT_60_tsangan_hhkb( \
-        k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c, k3d, \
-        k40, k41, k42,                k46,                k4a,      k4c, k4d  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, XXX, k3c, k3d },  \
-    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, XXX, k4c, k4d }   \
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
index cc41dbe8bd..1cb03ddb77 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/info.json
@@ -25,67 +25,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"label":"K00 (B0,D0)", "x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"label":"K01 (B0,D1)", "x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"label":"K02 (B0,D2)", "x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"label":"K03 (B0,D3)", "x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"label":"K05 (B0,D4)", "x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"label":"K06 (B0,D6)", "x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"label":"K07 (B0,D7)", "x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"label":"K08 (B0,B4)", "x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"label":"K09 (B0,B5)", "x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"label":"K0A (B0,B6)", "x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"label":"K0B (B0,C6)", "x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"label":"K0C (B0,C7)", "x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B1,D1)", "x":1.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label":"K12 (B1,D2)", "x":2.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label":"K13 (B1,D3)", "x":3.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label":"K14 (B1,D5)", "x":4.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label":"K15 (B1,D4)", "x":5.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label":"K16 (B1,D6)", "x":6.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label":"K17 (B1,D7)", "x":7.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label":"K18 (B1,B4)", "x":8.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label":"K19 (B1,B5)", "x":9.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label":"K1A (B1,B6)", "x":10.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label":"K1B (B1,C6)", "x":11.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label":"K1C (B1,C7)", "x":12.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label":"K1D (B1,F7)", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label":"K22 (B2,D2)", "x":1.75, "y":2},
-                {"label":"K23 (B2,D3)", "x":2.75, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label":"K24 (B2,D5)", "x":3.75, "y":2},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"label":"K25 (B2,D4)", "x":4.75, "y":2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"label":"K26 (B2,D6)", "x":5.75, "y":2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"label":"K27 (B2,D7)", "x":6.75, "y":2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"label":"K28 (B2,B4)", "x":7.75, "y":2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"label":"K29 (B2,B5)", "x":8.75, "y":2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"label":"K2A (B2,B6)", "x":9.75, "y":2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"label":"K2B (B2,C6)", "x":10.75, "y":2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"label":"K2C (B2,C7)", "x":11.75, "y":2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"label":"K2D (B2,F7)", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"label":"K31 (B3,D1)", "x":0, "y":3, "w":2.25},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"label":"K32 (B3,D2)", "x":2.25, "y":3},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label":"K33 (B3,D3)", "x":3.25, "y":3},
-                {"label":"K34 (B3,D5)", "x":4.25, "y":3},
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
-                {"label":"K35 (B3,D4)", "x":5.25, "y":3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label":"K36 (B3,D6)", "x":6.25, "y":3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label":"K37 (B3,D7)", "x":7.25, "y":3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label":"K38 (B3,B4)", "x":8.25, "y":3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label":"K39 (B3,B5)", "x":9.25, "y":3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label":"K3A (B3,B6)", "x":10.25, "y":3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label":"K3B (B3,C6)", "x":11.25, "y":3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label":"K3D (B3,F7)", "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"K4C (E6,C7)", "x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"K4D (E6,F7)", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c
index 4029a5466c..d5dd1f2f97 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.c
@@ -13,7 +13,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "rev1.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.h
deleted file mode 100644
index 02a28377e6..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/rev1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 ipetepete
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,          \
-    K31,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,            \
-    K40,  K41,  K42,              K46,                K49,  K4A,  K4C,  K4D      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   KC_NO, K4C,   K4D   }, \
-}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index a85b20cd5f..1620ac77da 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -25,71 +25,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3,"w":2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x":10, "y":4,"w":1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4,"w":1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4,"w":1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4,"w":1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index a9c5508236..ee95726e16 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -13,7 +13,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "rev2.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h
deleted file mode 100644
index 6b4344586a..0000000000
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 bdtc123
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,          \
-    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,        K3D,     \
-    K40,  K41,  K42,              K45,                 K49,  K4A,   K4B,  K4D    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   KC_NO, KC_NO, K3D   }, \
-    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   KC_NO, K4D   }, \
-}
diff --git a/keyboards/melgeek/mj61/info.json b/keyboards/melgeek/mj61/info.json
index 0a6e033dea..3e62cbf28a 100644
--- a/keyboards/melgeek/mj61/info.json
+++ b/keyboards/melgeek/mj61/info.json
@@ -16,71 +16,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x":10, "y":4, "w":1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/melgeek/mj61/mj61.h b/keyboards/melgeek/mj61/mj61.h
deleted file mode 100644
index 1881196dba..0000000000
--- a/keyboards/melgeek/mj61/mj61.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
-    K40, K41,      K43,      K45,                K49, K4A, K4B,      K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
-    { K40, K41, XXX, K43, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D }  \
-}
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 9c24335f82..8f8b48b017 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "mj61.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index 61588958dc..448fa0bb18 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "mj61.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index 2a783dd0a0..73d1323cfb 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -1,4 +1,4 @@
-#include "gm862.h"
+#include "quantum.h"
 #ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
diff --git a/keyboards/miller/gm862/gm862.h b/keyboards/miller/gm862/gm862.h
deleted file mode 100644
index 2e16d82869..0000000000
--- a/keyboards/miller/gm862/gm862.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,           K3D,\
-    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, XXX, K3D }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, XXX, K4C, K4D }  \
-}
diff --git a/keyboards/miller/gm862/info.json b/keyboards/miller/gm862/info.json
index ec09fc96a4..c66bba782f 100644
--- a/keyboards/miller/gm862/info.json
+++ b/keyboards/miller/gm862/info.json
@@ -22,71 +22,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
-                {"x":10, "y":4, "w":1.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
deleted file mode 100644
index e1e607e4c9..0000000000
--- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 MTBKeys
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define ___ KC_NO
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │11   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │40  │41  │42  │46                      │4a  │4b  │4d  │4e  │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-#define LAYOUT_60_ansi( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
-         k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
-    k40, k41, k42,                k46,                k4a, k4b,      k4d, k4e  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
-    { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
-    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
-    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, ___ }, \
-    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4d, ___, k4e }  \
-}
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index f9f86f9b02..c1acbc3b86 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -25,71 +25,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"label":"Esc", "x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"label":"1!", "x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"label":"2@", "x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"label":"3#", "x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"label":"4$", "x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"label":"5%", "x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"label":"6^", "x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"label":"7&", "x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"label":"8*", "x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"label":"9(", "x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"label":"0)", "x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"label":"-_", "x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"label":"=+", "x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"label":"Back Space", "x":13, "y":0, "w":2},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
-                {"label":"Q", "x":1.5, "y":1},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
-                {"label":"W", "x":2.5, "y":1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
-                {"label":"E", "x":3.5, "y":1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
-                {"label":"R", "x":4.5, "y":1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
-                {"label":"T", "x":5.5, "y":1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
-                {"label":"Y", "x":6.5, "y":1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
-                {"label":"U", "x":7.5, "y":1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
-                {"label":"I", "x":8.5, "y":1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
-                {"label":"O", "x":9.5, "y":1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
-                {"label":"P", "x":10.5, "y":1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
-                {"label":"[{", "x":11.5, "y":1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
-                {"label":"]}", "x":12.5, "y":1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
-                {"label":"\\|", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label":"A", "x":1.75, "y":2},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
-                {"label":"S", "x":2.75, "y":2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
-                {"label":"D", "x":3.75, "y":2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
-                {"label":"F", "x":4.75, "y":2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
-                {"label":"G", "x":5.75, "y":2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
-                {"label":"H", "x":6.75, "y":2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
-                {"label":"J", "x":7.75, "y":2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
-                {"label":"K", "x":8.75, "y":2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
-                {"label":"L", "x":9.75, "y":2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
-                {"label":";:", "x":10.75, "y":2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
-                {"label":"'\"", "x":11.75, "y":2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label":"Left Shift", "x":0, "y":3, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label":"Z", "x":2.25, "y":3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"label":"X", "x":3.25, "y":3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"label":"C", "x":4.25, "y":3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"label":"V", "x":5.25, "y":3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"label":"B", "x":6.25, "y":3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"label":"N", "x":7.25, "y":3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"label":"M", "x":8.25, "y":3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"label":",<", "x":9.25, "y":3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"label":".>", "x":10.25, "y":3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"label":"/?", "x":11.25, "y":3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"label":"Right Shift", "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
-                {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"label":"Right Ctrl", "x":10, "y":4, "w":1.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"label":"MO(1)", "x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"label":"Right Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/reviung/reviung61/info.json b/keyboards/reviung/reviung61/info.json
index 6ac0d48751..c76f797d40 100644
--- a/keyboards/reviung/reviung61/info.json
+++ b/keyboards/reviung/reviung61/info.json
@@ -19,67 +19,71 @@
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":0, "y":3, "w":2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":2.25, "y":3},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/reviung/reviung61/reviung61.h b/keyboards/reviung/reviung61/reviung61.h
deleted file mode 100644
index bae0cd2155..0000000000
--- a/keyboards/reviung/reviung61/reviung61.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2020 gtips
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-/* ANSI
- * ,-----------------------------------------------------------.
- * | 00| 01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c|    0d |
- * |-----------------------------------------------------------|
- * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d |
- * |-----------------------------------------------------------|
- * | 20   | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b|     2c |
- * |-----------------------------------------------------------|
- * | 30     | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a|       3b |
- * |-----------------------------------------------------------|
- * | 40 | 41 | 42 |        45              | 48 | 49 | 4a | 4b |
- * `-----------------------------------------------------------'
- */
-#define LAYOUT_60_ansi( \
-    k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,   k0b,   k0c,   k0d, \
-    k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,   k1b,   k1c,   k1d, \
-    k20,       k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2b,      k2c, \
-    k30,          k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,          k3b, \
-    k40,   k41,   k42,                        k45,                        k48,   k49,   k4a,   k4b  \
-) \
-{ \
-    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0a,   k0b,   k0c,   k0d   }, \
-    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,   k1b,   k1c,   k1d   }, \
-    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2b,   k2c,   KC_NO }, \
-    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,   k3b,   KC_NO, KC_NO }, \
-    { k40,   k41,   k42,   KC_NO, KC_NO, k45,   KC_NO, KC_NO, k48,   k49,   k4a,   k4b,   KC_NO, KC_NO }  \
-}
diff --git a/keyboards/senselessclay/ck60/ck60.c b/keyboards/senselessclay/ck60/ck60.c
index 1c30b77185..3f8aea611a 100644
--- a/keyboards/senselessclay/ck60/ck60.c
+++ b/keyboards/senselessclay/ck60/ck60.c
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include "ck60.h"
+#include "quantum.h"
 #define __ NO_LED
diff --git a/keyboards/senselessclay/ck60/ck60.h b/keyboards/senselessclay/ck60/ck60.h
deleted file mode 100644
index a9408ba2ea..0000000000
--- a/keyboards/senselessclay/ck60/ck60.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-#include "quantum.h"
-#define ___ KC_NO
-#define LAYOUT_60_iso( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
-    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index 841c8fb429..0e27424dac 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -28,72 +28,72 @@
    "layouts": {
        "LAYOUT_60_iso": {
            "layout": [
-                {"x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-                {"x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x":1.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x":2.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x":3.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x":4.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x":5.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x":6.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x":7.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x":8.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x":9.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x":10.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x":11.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x":12.5, "y":1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x":0, "y":2, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x":1.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x":2.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x":3.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x":4.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x":5.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x":6.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x":7.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x":8.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x":9.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x":10.75, "y":2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x":11.75, "y":2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x":12.75, "y":2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-                {"x":0, "y":3, "w":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
-                {"x":1.25, "y":3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
-                {"x":2.25, "y":3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                {"x":3.25, "y":3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                {"x":4.25, "y":3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {"x":5.25, "y":3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                {"x":6.25, "y":3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                {"x":7.25, "y":3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                {"x":8.25, "y":3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                {"x":9.25, "y":3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {"x":10.25, "y":3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                {"x":11.25, "y":3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
-                {"x":0, "y":4, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"x":1.25, "y":4, "w":1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y":4, "w":1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y":4, "w":6.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
-                {"x":10, "y":4, "w":1.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
-                {"x":11.25, "y":4, "w":1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
-                {"x":12.5, "y":4, "w":1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
            ]
        }
    }
diff --git a/keyboards/tokyokeyboard/tokyo60/info.json b/keyboards/tokyokeyboard/tokyo60/info.json
index 49a7c08f63..cd2cfe2248 100644
--- a/keyboards/tokyokeyboard/tokyo60/info.json
+++ b/keyboards/tokyokeyboard/tokyo60/info.json
@@ -25,314 +25,71 @@
    "community_layouts": ["60_hhkb"],
    "layouts": {
        "LAYOUT_60_hhkb": {
-            "layout": [{
+            "layout": [
-                    "label": "Esc",
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                    "x": 0,
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                    "y": 0
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                },
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                    "label": "!",
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                    "x": 1,
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                    "y": 0
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                },
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                    "label": "@",
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                    "x": 2,
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                    "y": 0
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                },
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                {
+                {"matrix": [1, 13], "x": 14, "y": 0},
-                    "label": "#",
-                    "x": 3,
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                    "y": 0
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                },
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                    "label": "$",
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                    "x": 4,
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                    "y": 0
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                },
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                    "label": "%",
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                    "x": 5,
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                    "y": 0
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                },
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
-                    "label": "^",
-                    "x": 6,
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                    "y": 0
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                },
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                    "label": "&",
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                    "x": 7,
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                    "y": 0
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                },
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                    "label": "*",
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                    "x": 8,
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                    "y": 0
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                },
+                {"matrix": [3, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {
-                    "label": "(",
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                    "x": 9,
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
-                    "y": 0
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
-                },
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
-                {
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
-                    "label": ")",
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
-                    "x": 10,
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
-                    "y": 0
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
-                },
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
-                {
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
-                    "label": "_",
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
-                    "x": 11,
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
-                    "y": 0
+                {"matrix": [4, 13], "x": 14, "y": 3},
-                },
-                {
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                    "label": "+",
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                    "x": 12,
+                {"matrix": [4, 5], "x": 4, "y": 4, "w": 7},
-                    "y": 0
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
-                },
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
-                {
-                    "label": "|",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "~",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "Tab",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 1.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "Delete",
-                    "x": 13.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Control",
-                    "x": 0,
-                    "y": 2,
-                    "w": 1.75
-                },
-                {
-                    "label": "A",
-                    "x": 1.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 12.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "Fn",
-                    "x": 14,
-                    "y": 3
-                },
-                {
-                    "label": "Os",
-                    "x": 1.5,
-                    "y": 4
-                },
-                {
-                    "label": "Alt",
-                    "x": 2.5,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "x": 4,
-                    "y": 4,
-                    "w": 7
-                },
-                {
-                    "label": "Alt",
-                    "x": 11,
-                    "y": 4,
-                    "w": 1.5
-                },
-                {
-                    "label": "Os",
-                    "x": 12.5,
-                    "y": 4
-                }
            ]
        }
    }
diff --git a/keyboards/tokyokeyboard/tokyo60/tokyo60.h b/keyboards/tokyokeyboard/tokyo60/tokyo60.h
deleted file mode 100644
index 9eb5f3e624..0000000000
--- a/keyboards/tokyokeyboard/tokyo60/tokyo60.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define XXX KC_NO
-#define LAYOUT_60_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K3D, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, K4D, \
-         K42, K43,           K46,                          K4B, K4C       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { XXX, K42, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, XXX, K4B, K4C, K4D }  \
-}
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 01ec8b32c7..62e5fae73b 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -24,72 +24,72 @@
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
-                {"x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
-                {"x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
-                {"x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 7},
+                {"matrix": [5, 5], "x": 4, "y": 4, "w": 7},
-                {"x": 11, "y": 4, "w": 1.5},
+                {"matrix": [5, 10], "x": 11, "y": 4, "w": 1.5},
-                {"x": 12.5, "y": 4},
+                {"matrix": [5, 11], "x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5}
+                {"matrix": [5, 12], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }
diff --git a/keyboards/tr60w/tr60w.c b/keyboards/tr60w/tr60w.c
index 83547a8862..2bc0648241 100644
--- a/keyboards/tr60w/tr60w.c
+++ b/keyboards/tr60w/tr60w.c
@@ -1,4 +1,4 @@
-#include "tr60w.h"
+#include "quantum.h"
 bool led_update_kb(led_t led_state) {
    bool runDefault = led_update_user(led_state);
diff --git a/keyboards/tr60w/tr60w.h b/keyboards/tr60w/tr60w.h
deleted file mode 100644
index 9fa5d5b61f..0000000000
--- a/keyboards/tr60w/tr60w.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_tsangan_hhkb( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K113, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K212, \
-    K300,       K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
-    K400, K401, K402,                      K505,                      K510, K511, K512  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113  }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO }, \
-    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO }  \
-}
diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
index fc0439a527..730c17c61f 100644
--- a/keyboards/weirdo/naiping/nphhkb/info.json
+++ b/keyboards/weirdo/naiping/nphhkb/info.json
@@ -26,68 +26,72 @@
    "layouts": {
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
-                {"label":"K00)", "x":0, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"label":"K01", "x":1, "y":0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
-                {"label":"K02", "x":2, "y":0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"label":"K03", "x":3, "y":0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"label":"K04", "x":4, "y":0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
-                {"label":"K05", "x":5, "y":0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
-                {"label":"K06", "x":6, "y":0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"label":"K07", "x":7, "y":0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"label":"K08", "x":8, "y":0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"label":"K09", "x":9, "y":0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"label":"K0A", "x":10, "y":0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"label":"K0B", "x":11, "y":0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"label":"K0C", "x":12, "y":0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"label":"K0D", "x":13, "y":0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"label":"K0E ", "x":14, "y":0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
-                {"label":"K12", "x":2.5, "y":1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
-                {"label":"K13", "x":3.5, "y":1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
-                {"label":"K14", "x":4.5, "y":1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
-                {"label":"K15", "x":5.5, "y":1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
-                {"label":"K16", "x":6.5, "y":1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
-                {"label":"K17", "x":7.5, "y":1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
-                {"label":"K18", "x":8.5, "y":1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
-                {"label":"K19", "x":9.5, "y":1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
-                {"label":"K1A", "x":10.5, "y":1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
-                {"label":"K1B", "x":11.5, "y":1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
-                {"label":"K1C", "x":12.5, "y":1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
-                {"label":"K1D", "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
-                {"label":"K23", "x":3.75, "y":2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
-                {"label":"K24", "x":4.75, "y":2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
-                {"label":"K25", "x":5.75, "y":2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
-                {"label":"K26", "x":6.75, "y":2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
-                {"label":"K27", "x":7.75, "y":2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
-                {"label":"K28", "x":8.75, "y":2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
-                {"label":"K29", "x":9.75, "y":2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
-                {"label":"K2A", "x":10.75, "y":2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
-                {"label":"K2B", "x":11.75, "y":2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
-                {"label":"K2D", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
-                {"label":"K30", "x":0, "y":3, "w":2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
-                {"label":"K31", "x":2.25, "y":3},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-                {"label":"K32", "x":3.25, "y":3},
-                {"label":"K33", "x":4.25, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                {"label":"K34", "x":5.25, "y":3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
-                {"label":"K35", "x":6.25, "y":3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
-                {"label":"K36", "x":7.25, "y":3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
-                {"label":"K37", "x":8.25, "y":3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
-                {"label":"K38", "x":9.25, "y":3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
-                {"label":"K39", "x":10.25, "y":3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
-                {"label":"K3A", "x":11.25, "y":3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
-                {"label":"K3B", "x":12.25, "y":3, "w":1.75},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
-                {"label":"K3D", "x":14, "y":3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
-                {"label":"K40", "x":0, "y":4, "w":1.5},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
-                {"label":"K41", "x":1.5, "y":4},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
-                {"label":"K42", "x":2.5, "y":4, "w":1.5},
+                {"matrix": [3, 13], "x": 14, "y": 3},
-                {"label":"K46", "x":4, "y":4, "w":7},
-                {"label":"K4A", "x":11, "y":4, "w":1.5},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                {"label":"K4B", "x":12.5, "y":4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
-                {"label":"K4D", "x":13.5, "y":4, "w":1.5}
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }
diff --git a/keyboards/weirdo/naiping/nphhkb/nphhkb.h b/keyboards/weirdo/naiping/nphhkb/nphhkb.h
deleted file mode 100644
index 96c99451b4..0000000000
--- a/keyboards/weirdo/naiping/nphhkb/nphhkb.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 Weirdo
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-#define ___ KC_NO
-#define LAYOUT_60_tsangan_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, ___ }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___ }, \
-    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, ___ } \
-}
diff --git a/keyboards/wilba_tech/rama_works_kara/info.json b/keyboards/wilba_tech/rama_works_kara/info.json
index 3dd9ad22c2..70220be9e0 100644
--- a/keyboards/wilba_tech/rama_works_kara/info.json
+++ b/keyboards/wilba_tech/rama_works_kara/info.json
@@ -18,7 +18,72 @@
    "community_layouts": ["60_hhkb"],
    "layouts": {
        "LAYOUT_60_hhkb": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Delete", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
        }
    }
 }
diff --git a/keyboards/wilba_tech/rama_works_kara/rama_works_kara.h b/keyboards/wilba_tech/rama_works_kara/rama_works_kara.h
index c3e06f8521..b712f6ccd3 100644
--- a/keyboards/wilba_tech/rama_works_kara/rama_works_kara.h
+++ b/keyboards/wilba_tech/rama_works_kara/rama_works_kara.h
@@ -18,20 +18,3 @@
 #include "quantum.h"
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-#define XXX KC_NO
-#define LAYOUT_60_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-         K41, K42,                     K47,                K4B, K4C       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { XXX, K41, K42, XXX, XXX, XXX, XXX, K47, XXX, XXX, XXX, K4B, K4C, XXX }  \
-}
diff --git a/keyboards/wilba_tech/rama_works_m60_a/info.json b/keyboards/wilba_tech/rama_works_m60_a/info.json
index 8ba17a5df2..2db91faf86 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/info.json
+++ b/keyboards/wilba_tech/rama_works_m60_a/info.json
@@ -18,7 +18,72 @@
    "community_layouts": ["60_hhkb"],
    "layouts": {
        "LAYOUT_60_hhkb": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Delete", "x":13.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 12.5, "y": 4}
+            ]
        }
    }
 }
diff --git a/keyboards/wilba_tech/rama_works_m60_a/rama_works_m60_a.h b/keyboards/wilba_tech/rama_works_m60_a/rama_works_m60_a.h
index 2c690122ba..3966f822ee 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/rama_works_m60_a.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/rama_works_m60_a.h
@@ -18,20 +18,3 @@
 #include "quantum.h"
 #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
 #include "via.h"
-#define XXX KC_NO
-#define LAYOUT_60_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-         K41, K42,                     K47,                K4B, K4C       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { XXX, K41, K42, XXX, XXX, XXX, XXX, K47, XXX, XXX, XXX, K4B, K4C, XXX }  \
-}
diff --git a/keyboards/winkeyless/bface/bface.h b/keyboards/winkeyless/bface/bface.h
deleted file mode 100644
index bca0c24c1a..0000000000
--- a/keyboards/winkeyless/bface/bface.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Copyright 2017 Sebastian Kaim <sebb@sebb767.de>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-#include "quantum.h"
-#define LAYOUT_60_ansi( \
-  K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, \
-  K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, \
-  K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2,      KD2, \
-  K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1,           \
-  K00, K10, K20,           K56,                K57, KA0, KB0, KC0       \
-){ \
-  { K00,   K10,   K20,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KA0,   KB0,   KC0,   KC_NO, KC_NO }, \
-  { K01,   K11,   K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KA1,   KB1,   KC_NO, KC_NO, KC_NO }, \
-  { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KA2,   KB2,   KC_NO, KD2,   KC_NO }, \
-  { K03,   K13,   K23,   K33,   K43,   K53,   KC_NO, KC_NO, KC_NO, KC_NO, KA3,   KB3,   KC3,   KD3,   KC_NO }, \
-  { K04,   K14,   K24,   K34,   K44,   K54,   KC_NO, KC_NO, KC_NO, KC_NO, KA4,   KB4,   KC4,   KC_NO, KE4   }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB6,   KC6,   KD6,   KE6   }, \
-  { KC_NO, K17,   K27,   K37,   K47,   K57,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB7,   KC7,   KD7,   KE7   }  \
-}
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index 7d4375f8aa..2d716a89c7 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -27,8 +27,74 @@
  "processor": "atmega32a",
  "bootloader": "bootloadhid",
  "layouts": {
-      "LAYOUT_60_ansi": {
+    "LAYOUT_60_ansi": {
-          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+      "layout": [
-      }
+        {"matrix": [4, 0], "x": 0, "y": 0},
+        {"matrix": [4, 1], "x": 1, "y": 0},
+        {"matrix": [4, 2], "x": 2, "y": 0},
+        {"matrix": [4, 3], "x": 3, "y": 0},
+        {"matrix": [4, 4], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 11], "x": 7, "y": 0},
+        {"matrix": [7, 11], "x": 8, "y": 0},
+        {"matrix": [7, 1], "x": 9, "y": 0},
+        {"matrix": [4, 10], "x": 10, "y": 0},
+        {"matrix": [4, 11], "x": 11, "y": 0},
+        {"matrix": [4, 12], "x": 12, "y": 0},
+        {"matrix": [4, 14], "x": 13, "y": 0, "w": 2},
+        {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 1},
+        {"matrix": [3, 2], "x": 2.5, "y": 1},
+        {"matrix": [3, 3], "x": 3.5, "y": 1},
+        {"matrix": [3, 4], "x": 4.5, "y": 1},
+        {"matrix": [3, 5], "x": 5.5, "y": 1},
+        {"matrix": [6, 2], "x": 6.5, "y": 1},
+        {"matrix": [6, 12], "x": 7.5, "y": 1},
+        {"matrix": [7, 12], "x": 8.5, "y": 1},
+        {"matrix": [7, 2], "x": 9.5, "y": 1},
+        {"matrix": [3, 10], "x": 10.5, "y": 1},
+        {"matrix": [3, 11], "x": 11.5, "y": 1},
+        {"matrix": [3, 12], "x": 12.5, "y": 1},
+        {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [6, 3], "x": 6.75, "y": 2},
+        {"matrix": [6, 13], "x": 7.75, "y": 2},
+        {"matrix": [7, 13], "x": 8.75, "y": 2},
+        {"matrix": [7, 3], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [1, 1], "x": 2.25, "y": 3},
+        {"matrix": [1, 2], "x": 3.25, "y": 3},
+        {"matrix": [1, 3], "x": 4.25, "y": 3},
+        {"matrix": [1, 4], "x": 5.25, "y": 3},
+        {"matrix": [1, 5], "x": 6.25, "y": 3},
+        {"matrix": [6, 4], "x": 7.25, "y": 3},
+        {"matrix": [6, 14], "x": 8.25, "y": 3},
+        {"matrix": [7, 14], "x": 9.25, "y": 3},
+        {"matrix": [7, 4], "x": 10.25, "y": 3},
+        {"matrix": [1, 10], "x": 11.25, "y": 3},
+        {"matrix": [1, 11], "x": 12.25, "y": 3, "w": 2.75},
+        {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [7, 5], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [0, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [0, 11], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [0, 12], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
  }
 }