Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

11 files changed, 351 insertions, 543 deletions

diff --git a/keyboards/kbdfans/bounce/pad/info.json b/keyboards/kbdfans/bounce/pad/info.json
index 8e0105c073..e75747f2ea 100644
--- a/keyboards/kbdfans/bounce/pad/info.json
+++ b/keyboards/kbdfans/bounce/pad/info.json
@@ -21,32 +21,32 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"Ctrl", "x":1, "y":0},
-                {"label":"Alt", "x":2, "y":0},
-                {"label":"Backspace", "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1.25},
-                {"label":"/", "x":1, "y":1.25},
-                {"label":"*", "x":2, "y":1.25},
-                {"label":"-", "x":3, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-                {"label":"7", "x":0, "y":2.25},
-                {"label":"8", "x":1, "y":2.25},
-                {"label":"9", "x":2, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"label":"4", "x":0, "y":3.25},
-                {"label":"5", "x":1, "y":3.25},
-                {"label":"6", "x":2, "y":3.25},
-                {"label":"+", "x":3, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"label":"1", "x":0, "y":4.25},
-                {"label":"2", "x":1, "y":4.25},
-                {"label":"3", "x":2, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
 
-                {"label":"0", "x":0, "y":5.25, "w":2},
-                {"label":".", "x":2, "y":5.25},
-                {"label":"Enter", "x":3, "y":4.25, "h":2}
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/kbdfans/bounce/pad/pad.h b/keyboards/kbdfans/bounce/pad/pad.h
deleted file mode 100644
index a4bf9af55b..0000000000
--- a/keyboards/kbdfans/bounce/pad/pad.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 DZTECH <moyi4681@Live.cn>
- *
- * 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_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, \
-         K51, K52, K53  \
-) \
-{ \
-    { K00,  K01, K02, K03 }, \
-    { K10,  K11, K12, K13 }, \
-    { K20,  K21, K22, KC_NO }, \
-    { K30,  K31, K32, K33 }, \
-    { K40,  K41, K42, KC_NO }, \
-    { KC_NO,K51, K52, K53 } \
-}
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/info.json
index bd57aee969..07ec04645d 100644
--- a/keyboards/kbdfans/kbd4x/info.json
+++ b/keyboards/kbdfans/kbd4x/info.json
@@ -23,105 +23,111 @@
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [
-              {"label":"ESC", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"BKSP", "x":11, "y":0},
-              {"label":"TAB", "x":0, "y":1},
-              {"label":"A", "x":1, "y":1},
-              {"label":"S", "x":2, "y":1},
-              {"label":"D", "x":3, "y":1},
-              {"label":"F", "x":4, "y":1},
-              {"label":"G", "x":5, "y":1},
-              {"label":"H", "x":6, "y":1},
-              {"label":"J", "x":7, "y":1},
-              {"label":"K", "x":8, "y":1},
-              {"label":"L", "x":9, "y":1},
-              {"label":";", "x":10, "y":1},
-              {"label":"'", "x":11, "y":1},
-              {"label":"SHIFT", "x":0, "y":2},
-              {"label":"Z", "x":1, "y":2},
-              {"label":"X", "x":2, "y":2},
-              {"label":"C", "x":3, "y":2},
-              {"label":"V", "x":4, "y":2},
-              {"label":"B", "x":5, "y":2},
-              {"label":"N", "x":6, "y":2},
-              {"label":"M", "x":7, "y":2},
-              {"label":",", "x":8, "y":2},
-              {"label":".", "x":9, "y":2},
-              {"label":"UP", "x":10, "y":2},
-              {"label":"ENTER", "x":11, "y":2},
-              {"label":"LCTRL", "x":0, "y":3},
-              {"label":"LGUI", "x":1, "y":3},
-              {"label":"1", "x":2, "y":3},
-              {"label":"2", "x":3, "y":3},
-              {"label":"3", "x":4, "y":3},
-              {"label":"SPACE", "x":5, "y":3, "w":2},
-              {"label":"MO(1)", "x":7, "y":3},
-              {"label":"/", "x":8, "y":3},
-              {"label":"LEFT", "x":9, "y":3},
-              {"label":"DOWN", "x":10, "y":3},
-              {"label":"RIGHT", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-              {"label":"ESC", "x":0, "y":0},
-              {"label":"Q", "x":1, "y":0},
-              {"label":"W", "x":2, "y":0},
-              {"label":"E", "x":3, "y":0},
-              {"label":"R", "x":4, "y":0},
-              {"label":"T", "x":5, "y":0},
-              {"label":"Y", "x":6, "y":0},
-              {"label":"U", "x":7, "y":0},
-              {"label":"I", "x":8, "y":0},
-              {"label":"O", "x":9, "y":0},
-              {"label":"P", "x":10, "y":0},
-              {"label":"BKSP", "x":11, "y":0},
-              {"label":"TAB", "x":0, "y":1},
-              {"label":"A", "x":1, "y":1},
-              {"label":"S", "x":2, "y":1},
-              {"label":"D", "x":3, "y":1},
-              {"label":"F", "x":4, "y":1},
-              {"label":"G", "x":5, "y":1},
-              {"label":"H", "x":6, "y":1},
-              {"label":"J", "x":7, "y":1},
-              {"label":"K", "x":8, "y":1},
-              {"label":"L", "x":9, "y":1},
-              {"label":";", "x":10, "y":1},
-              {"label":"'", "x":11, "y":1},
-              {"label":"SHIFT", "x":0, "y":2},
-              {"label":"Z", "x":1, "y":2},
-              {"label":"X", "x":2, "y":2},
-              {"label":"C", "x":3, "y":2},
-              {"label":"V", "x":4, "y":2},
-              {"label":"B", "x":5, "y":2},
-              {"label":"N", "x":6, "y":2},
-              {"label":"M", "x":7, "y":2},
-              {"label":",", "x":8, "y":2},
-              {"label":".", "x":9, "y":2},
-              {"label":"UP", "x":10, "y":2},
-              {"label":"ENTER", "x":11, "y":2},
-              {"label":"LCTRL", "x":0, "y":3},
-              {"label":"LGUI", "x":1, "y":3},
-              {"label":"1", "x":2, "y":3},
-              {"label":"2", "x":3, "y":3},
-              {"label":"3", "x":4, "y":3},
-              {"label":"SPACE", "x":5, "y":3},
-              {"label":"MO(2)", "x":6, "y":3},
-              {"label":"MO(1)", "x":7, "y":3},
-              {"label":"/", "x":8, "y":3},
-              {"label":"LEFT", "x":9, "y":3},
-              {"label":"DOWN", "x":10, "y":3},
-              {"label":"RIGHT", "x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd4x/kbd4x.h b/keyboards/kbdfans/kbd4x/kbd4x.h
deleted file mode 100644
index 9e7e2ba220..0000000000
--- a/keyboards/kbdfans/kbd4x/kbd4x.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2018 sevenseacat
- *
- * 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_planck_mit( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06,   k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16,   k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26,   k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b }  \
-}
-
-// The PCB does support a grid layout, but the case does not.
-#define LAYOUT_ortho_4x12( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
-}
diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json
index a8fbafa348..3527370e4c 100644
--- a/keyboards/kbdfans/kbdpad/mk1/info.json
+++ b/keyboards/kbdfans/kbdpad/mk1/info.json
@@ -29,93 +29,93 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":2.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
 
-                {"x":0, "y":5.25, "w":2},
-                {"x":2, "y":5.25},
-                {"x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":2.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
 
-                {"x":0, "y":5.25, "w":2},
-                {"x":2, "y":5.25},
-                {"x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 2, "y": 0},
+                {"matrix": [5, 3], "x": 3, "y": 0},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 1.25},
+                {"matrix": [4, 1], "x": 1, "y": 1.25},
+                {"matrix": [4, 2], "x": 2, "y": 1.25},
+                {"matrix": [4, 3], "x": 3, "y": 1.25},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2.25},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 2.25},
+                {"matrix": [3, 1], "x": 1, "y": 2.25},
+                {"matrix": [3, 2], "x": 2, "y": 2.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3.25},
-                {"x":2, "y":3.25},
-                {"x":3, "y":3.25},
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2, "y": 3.25},
+                {"matrix": [2, 3], "x": 3, "y": 3.25},
 
-                {"x":0, "y":4.25},
-                {"x":1, "y":4.25},
-                {"x":2, "y":4.25},
-                {"x":3, "y":4.25},
+                {"matrix": [1, 0], "x": 0, "y": 4.25},
+                {"matrix": [1, 1], "x": 1, "y": 4.25},
+                {"matrix": [1, 2], "x": 2, "y": 4.25},
+                {"matrix": [1, 3], "x": 3, "y": 4.25},
 
-                {"x":0, "y":5.25},
-                {"x":1, "y":5.25},
-                {"x":2, "y":5.25},
-                {"x":3, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 5.25},
+                {"matrix": [0, 1], "x": 1, "y": 5.25},
+                {"matrix": [0, 2], "x": 2, "y": 5.25},
+                {"matrix": [0, 3], "x": 3, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.h b/keyboards/kbdfans/kbdpad/mk1/mk1.h
deleted file mode 100644
index 36b0287278..0000000000
--- a/keyboards/kbdfans/kbdpad/mk1/mk1.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2019 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 is a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT( \
-              k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, \
-    k00,      k02, k03 \
-) { \
-    { k00,   KC_NO, k02, k03   }, \
-    { k10,   k11,   k12, KC_NO }, \
-    { k20,   k21,   k22, k23   }, \
-    { k30,   k31,   k32, KC_NO }, \
-    { k40,   k41,   k42, k43   }, \
-    { KC_NO, KC_NO, k52, k53   } \
-}
-
-#define LAYOUT_numpad_6x4( \
-    k50, k51, k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, \
-    k00,      k02, k03 \
-) { \
-    { k00, KC_NO, k02, k03   }, \
-    { k10, k11,   k12, KC_NO }, \
-    { k20, k21,   k22, k23   }, \
-    { k30, k31,   k32, KC_NO }, \
-    { k40, k41,   k42, k43   }, \
-    { k50, k51,   k52, k53   } \
-}
-
-#define LAYOUT_ortho_6x4( \
-    k50, k51, k52, k53, \
-    k40, k41, k42, k43, \
-    k30, k31, k32, k33, \
-    k20, k21, k22, k23, \
-    k10, k11, k12, k13, \
-    k00, k01, k02, k03 \
-) { \
-    { k00, k01, k02, k03 }, \
-    { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }, \
-    { k30, k31, k32, k33 }, \
-    { k40, k41, k42, k43 }, \
-    { k50, k51, k52, k53 } \
-}
diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
index 1472e876d0..424771ae3d 100644
--- a/keyboards/kbdfans/kbdpad/mk2/info.json
+++ b/keyboards/kbdfans/kbdpad/mk2/info.json
@@ -26,33 +26,68 @@
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_6x4"],
     "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
+        },
         "LAYOUT_ortho_6x4": {
             "layout": [
-				{"x":0, "y":0},
-				{"x":1, "y":0},
-				{"x":2, "y":0},
-				{"x":3, "y":0},
-				{"x":0, "y":1.25},
-				{"x":1, "y":1.25},
-				{"x":2, "y":1.25},
-				{"x":3, "y":1.25},
-				{"x":0, "y":2.25},
-				{"x":1, "y":2.25},
-				{"x":2, "y":2.25},
-				{"x":3, "y":2.25},
-				{"x":0, "y":3.25},
-				{"x":1, "y":3.25},
-				{"x":2, "y":3.25},
-				{"x":3, "y":3.25},
-				{"x":0, "y":4.25},
-				{"x":1, "y":4.25},
-				{"x":2, "y":4.25},
-				{"x":3, "y":4.25},
-				{"x":0, "y":5.25},
-				{"x":1, "y":5.25},
-				{"x":2, "y":5.25},
-				{"x":3, "y":5.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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h
deleted file mode 100644
index 0dfa995fe2..0000000000
--- a/keyboards/kbdfans/kbdpad/mk2/mk2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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_ortho_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43, \
-    K50, K51, K52, K53  \
-) \
-{ \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 }, \
-    { K20, K21, K22, K23 }, \
-    { K30, K31, K32, K33 }, \
-    { K40, K41, K42, K43 }, \
-    { K50, K51, K52, K53 }  \
-}
-
-#define LAYOUT_numpad_6x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, \
-    K50,      K52, K53  \
-) \
-{ \
-    { K00, K01,   K02, K03 }, \
-    { K10, K11,   K12, K13 }, \
-    { K20, K21,   K22, KC_NO }, \
-    { K30, K31,   K32, K33 }, \
-    { K40, K41,   K42, KC_NO }, \
-    { K50, KC_NO, K52, K53 } \
-}
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
index 82bbf786dd..f866a95c9f 100644
--- a/keyboards/kbdfans/niu_mini/info.json
+++ b/keyboards/kbdfans/niu_mini/info.json
@@ -20,109 +20,118 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["ortho_4x12", "planck_mit"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_4x12"
+    },
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "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":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
-                {"x":4, "y":1},
-                {"x":5, "y":1},
-                {"x":6, "y":1},
-                {"x":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+