Move fullsize layouts to data driven (#20317)

7 files changed, 629 insertions, 734 deletions

diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json
index f29633d429..a4d0b11b58 100644
--- a/keyboards/handwired/boss566y/redragon_vara/info.json
+++ b/keyboards/handwired/boss566y/redragon_vara/info.json
@@ -19,110 +19,128 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K02 (B0,D3)", "x":2, "y":0},
-                {"label":"K03 (B0,C6)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,C7)", "x":5, "y":0},
-                {"label":"K07 (B0,D7)", "x":6.5, "y":0},
-                {"label":"K08 (B0,B4)", "x":7.5, "y":0},
-                {"label":"K09 (B0,B5)", "x":8.5, "y":0},
-                {"label":"K0A (B0,B6)", "x":9.5, "y":0},
-                {"label":"K6A (F0,B6)", "x":11, "y":0},
-                {"label":"K69 (F0,B5)", "x":12, "y":0},
-                {"label":"K68 (F0,B4)", "x":13, "y":0},
-                {"label":"K67 (F0,D7)", "x":14, "y":0},
-                {"label":"K66 (F0,D4)", "x":15.25, "y":0},
-                {"label":"K65 (F0,C7)", "x":16.25, "y":0},
-                {"label":"K64 (F0,D5)", "x":17.25, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B1,D2)", "x":1, "y":1.5},
-                {"label":"K12 (B1,D3)", "x":2, "y":1.5},
-                {"label":"K13 (B1,C6)", "x":3, "y":1.5},
-                {"label":"K14 (B1,D5)", "x":4, "y":1.5},
-                {"label":"K15 (B1,C7)", "x":5, "y":1.5},
-                {"label":"K16 (B1,D4)", "x":6, "y":1.5},
-                {"label":"K17 (B1,D7)", "x":7, "y":1.5},
-                {"label":"K18 (B1,B4)", "x":8, "y":1.5},
-                {"label":"K19 (B1,B5)", "x":9, "y":1.5},
-                {"label":"K1A (B1,B6)", "x":10, "y":1.5},
-                {"label":"K7A (F1,B6)", "x":11, "y":1.5},
-                {"label":"K79 (F1,B5)", "x":12, "y":1.5},
-                {"label":"K78 (F1,B4)", "x":13, "y":1.5, "w":2},
-                {"label":"K76 (F1,D4)", "x":15.25, "y":1.5},
-                {"label":"K75 (F1,C7)", "x":16.25, "y":1.5},
-                {"label":"K74 (F1,D5)", "x":17.25, "y":1.5},
-                {"label":"K73 (F1,C6)", "x":18.5, "y":1.5},
-                {"label":"K72 (F1,D3)", "x":19.5, "y":1.5},
-                {"label":"K71 (F1,D2)", "x":20.5, "y":1.5},
-                {"label":"K70 (F1,D1)", "x":21.5, "y":1.5},
-                {"label":"K20 (B2,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B2,D2)", "x":1.5, "y":2.5},
-                {"label":"K22 (B2,D3)", "x":2.5, "y":2.5},
-                {"label":"K23 (B2,C6)", "x":3.5, "y":2.5},
-                {"label":"K24 (B2,D5)", "x":4.5, "y":2.5},
-                {"label":"K25 (B2,C7)", "x":5.5, "y":2.5},
-                {"label":"K26 (B2,D4)", "x":6.5, "y":2.5},
-                {"label":"K27 (B2,D7)", "x":7.5, "y":2.5},
-                {"label":"K28 (B2,B4)", "x":8.5, "y":2.5},
-                {"label":"K29 (B2,B5)", "x":9.5, "y":2.5},
-                {"label":"K2A (B2,B6)", "x":10.5, "y":2.5},
-                {"label":"K8A (F4,B6)", "x":11.5, "y":2.5},
-                {"label":"K89 (F4,B5)", "x":12.5, "y":2.5},
-                {"label":"K87 (F4,D7)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K86 (F4,D4)", "x":15.25, "y":2.5},
-                {"label":"K85 (F4,C7)", "x":16.25, "y":2.5},
-                {"label":"K84 (F4,D5)", "x":17.25, "y":2.5},
-                {"label":"K83 (F4,C6)", "x":18.5, "y":2.5},
-                {"label":"K82 (F4,D3)", "x":19.5, "y":2.5},
-                {"label":"K81 (F4,D2)", "x":20.5, "y":2.5},
-                {"label":"K90 (F5,D1)", "x":21.5, "y":2.5, "h":2},
-                {"label":"K30 (B3,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B3,D2)", "x":1.75, "y":3.5},
-                {"label":"K32 (B3,D3)", "x":2.75, "y":3.5},
-                {"label":"K33 (B3,C6)", "x":3.75, "y":3.5},
-                {"label":"K34 (B3,D5)", "x":4.75, "y":3.5},
-                {"label":"K35 (B3,C7)", "x":5.75, "y":3.5},
-                {"label":"K36 (B3,D4)", "x":6.75, "y":3.5},
-                {"label":"K37 (B3,D7)", "x":7.75, "y":3.5},
-                {"label":"K38 (B3,B4)", "x":8.75, "y":3.5},
-                {"label":"K39 (B3,B5)", "x":9.75, "y":3.5},
-                {"label":"K3A (B3,B6)", "x":10.75, "y":3.5},
-                {"label":"K9A (F5,B6)", "x":11.75, "y":3.5},
-                {"label":"K98 (F5,B4)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K93 (F5,C6)", "x":18.5, "y":3.5},
-                {"label":"K92 (F5,D3)", "x":19.5, "y":3.5},
-                {"label":"K91 (F5,D2)", "x":20.5, "y":3.5},
-                {"label":"K40 (B7,D1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (B7,D3)", "x":2.25, "y":4.5},
-                {"label":"K43 (B7,C6)", "x":3.25, "y":4.5},
-                {"label":"K44 (B7,D5)", "x":4.25, "y":4.5},
-                {"label":"K45 (B7,C7)", "x":5.25, "y":4.5},
-                {"label":"K46 (B7,D4)", "x":6.25, "y":4.5},
-                {"label":"K47 (B7,D7)", "x":7.25, "y":4.5},
-                {"label":"K48 (B7,B4)", "x":8.25, "y":4.5},
-                {"label":"K49 (B7,B5)", "x":9.25, "y":4.5},
-                {"label":"K4A (B7,B6)", "x":10.25, "y":4.5},
-                {"label":"KAA (F6,B6)", "x":11.25, "y":4.5},
-                {"label":"KA8 (F6,B4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"KA5 (F6,C7)", "x":16.25, "y":4.5},
-                {"label":"KA3 (F6,C6)", "x":18.5, "y":4.5},
-                {"label":"KA2 (F6,D3)", "x":19.5, "y":4.5},
-                {"label":"KA1 (F6,D2)", "x":20.5, "y":4.5},
-                {"label":"KB0 (F7,D1)", "x":21.5, "y":4.5, "h":2},
-                {"label":"K50 (D0,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D0,D2)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K53 (D0,C6)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (D0,D4)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5A (D0,B6)", "x":10, "y":5.5, "w":1.25},
-                {"label":"KBA (F7,B6)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"KB9 (F7,B5)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"KB7 (F7,D7)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"KB6 (F7,D4)", "x":15.25, "y":5.5},
-                {"label":"KB5 (F7,C7)", "x":16.25, "y":5.5},
-                {"label":"KB4 (F7,D5)", "x":17.25, "y":5.5},
-                {"label":"KB3 (F7,C6)", "x":18.5, "y":5.5, "w":2},
-                {"label":"KB1 (F7,D2)", "x":20.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 10], "x": 11, "y": 0},
+                {"matrix": [6, 9], "x": 12, "y": 0},
+                {"matrix": [6, 8], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [7, 10], "x": 11, "y": 1.5},
+                {"matrix": [7, 9], "x": 12, "y": 1.5},
+                {"matrix": [7, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 4], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 0], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 4], "x": 17.25, "y": 2.5},
+
+                {"matrix": [8, 3], "x": 18.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 19.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [9, 0], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [9, 3], "x": 18.5, "y": 3.5},
+                {"matrix": [9, 2], "x": 19.5, "y": 3.5},
+                {"matrix": [9, 1], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [10, 5], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 3], "x": 18.5, "y": 4.5},
+                {"matrix": [10, 2], "x": 19.5, "y": 4.5},
+                {"matrix": [10, 1], "x": 20.5, "y": 4.5},
+                {"matrix": [11, 0], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 4], "x": 17.25, "y": 5.5},
+
+                {"matrix": [11, 3], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [11, 1], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
deleted file mode 100644
index 3809fa8ce4..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 boss566y
- *
- * 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_fullsize_ansi( \
-    K00,      K02, K03, K04, K05,   K07, K08, K09, K0A,    K6A, K69, K68, K67,  K66, K65, K64,                      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K7A, K79, K78,       K76, K75, K74,  K73, K72, K71, K70, \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K8A, K89, K87,     K86, K85, K84,  K83, K82, K81, K90, \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K9A, K98,                         K93, K92, K91,      \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, KAA, KA8,                KA5,       KA3, KA2, KA1, KB0, \
-    K50,  K51,  K53,              K56,                K5A,  KBA,  KB9,  KB7,    KB6, KB5, KB4,  KB3,      KB1       \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, 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,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A   }, \
-    { K50,   K51,   KC_NO, K53,   KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K64,   K65,   K66,   K67,   K68,   K69,   K6A   }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, K78,   K79,   K7A   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   KC_NO, K89,   K8A   }, \
-    { K90,   K91,   K92,   K93,   KC_NO, KC_NO, KC_NO, KC_NO, K98,   KC_NO, K9A   }, \
-    { KC_NO, KA1,   KA2,   KA3,   KC_NO, KA5,   KC_NO, KC_NO, KA8,   KC_NO, KAA   }, \
-    { KB0,   KB1,   KC_NO, KB3,   KB4,   KB5,   KB6,   KB7,   KC_NO, KB9,   KBA   }, \
-}
diff --git a/keyboards/handwired/hnah108/hnah108.c b/keyboards/handwired/hnah108/hnah108.c
index 20cbe941fd..fde7b16564 100644
--- a/keyboards/handwired/hnah108/hnah108.c
+++ b/keyboards/handwired/hnah108/hnah108.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hnah108.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/handwired/hnah108/hnah108.h b/keyboards/handwired/hnah108/hnah108.h
deleted file mode 100644
index a11f9fc6d5..0000000000
--- a/keyboards/handwired/hnah108/hnah108.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * 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_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { 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, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,        k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { 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, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                    k96, k97, k88, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { 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, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \
-}
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index e18dc6c09d..6fdf6a699a 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -28,341 +28,398 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "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": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 6], "x": 18.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 19.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "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": [1, 4], "x": 4, "y": 1.25},