Move single `LAYOUT`s to data driven (#20365)

4 files changed, 208 insertions, 253 deletions

diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json
index d42f6dbef6..001c73f683 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/info.json
@@ -21,114 +21,131 @@
     },
     "processor": "atmega32a",
     "bootloader": "usbasploader",
-    "layouts": {
+     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B0,B7)", "x":0, "y":0},
-                {"label":"K01 (B0,C0)", "x":1.25, "y":0},
-                {"label":"K02 (B0,C1)", "x":2.25, "y":0},
-                {"label":"K03 (B0,C2)", "x":3.25, "y":0},
-                {"label":"K04 (B0,C3)", "x":4.25, "y":0},
-                {"label":"K05 (B0,C4)", "x":5.5, "y":0},
-                {"label":"K06 (B0,C5)", "x":6.5, "y":0},
-                {"label":"K07 (B0,C6)", "x":7.5, "y":0},
-                {"label":"K08 (B0,C7)", "x":8.5, "y":0},
-                {"label":"K09 (B0,D0)", "x":9.75, "y":0},
-                {"label":"K0A (B0,D1)", "x":10.75, "y":0},
-                {"label":"K0B (B0,D2)", "x":11.75, "y":0},
-                {"label":"K0C (B0,D3)", "x":12.75, "y":0},
-                {"label":"K0E (B0,D5)", "x":15.5, "y":0},
-                {"label":"K0F (B0,D6)", "x":16.5, "y":0},
-                {"label":"K0G (B0,D7)", "x":17.5, "y":0},
-                {"label":"K0H (B0,E0)", "x":18.5, "y":0},
-                {"label":"K5E (B5,D5)", "x":15.5, "y":1},
-                {"label":"K5F (B5,D6)", "x":16.5, "y":1},
-                {"label":"K5G (B5,D7)", "x":17.5, "y":1},
-                {"label":"K5H (B5,E0)", "x":18.5, "y":1},
-                {"label":"K10 (B1,B7)", "x":0, "y":2},
-                {"label":"K11 (B1,C0)", "x":1, "y":2},
-                {"label":"K12 (B1,C1)", "x":2, "y":2},
-                {"label":"K13 (B1,C2)", "x":3, "y":2},
-                {"label":"K14 (B1,C3)", "x":4, "y":2},
-                {"label":"K15 (B1,C4)", "x":5, "y":2},
-                {"label":"K16 (B1,C5)", "x":6, "y":2},
-                {"label":"K17 (B1,C6)", "x":7, "y":2},
-                {"label":"K18 (B1,C7)", "x":8, "y":2},
-                {"label":"K19 (B1,D0)", "x":9, "y":2},
-                {"label":"K1A (B1,D1)", "x":10, "y":2},
-                {"label":"K1B (B1,D2)", "x":11, "y":2},
-                {"label":"K1C (B1,D3)", "x":12, "y":2},
-                {"label":"K1D (B1,D4)", "x":13, "y":2},
-                {"label":"K0D (B0,D4)", "x":14, "y":2},
-                {"label":"K1E (B1,D5)", "x":15.5, "y":2},
-                {"label":"K1F (B1,D6)", "x":16.5, "y":2},
-                {"label":"K1G (B1,D7)", "x":17.5, "y":2},
-                {"label":"K1H (B1,E0)", "x":18.5, "y":2},
-                {"label":"K20 (B2,B7)", "x":0, "y":3, "w":1.5},
-                {"label":"K21 (B2,C0)", "x":1.5, "y":3},
-                {"label":"K22 (B2,C1)", "x":2.5, "y":3},
-                {"label":"K23 (B2,C2)", "x":3.5, "y":3},
-                {"label":"K24 (B2,C3)", "x":4.5, "y":3},
-                {"label":"K25 (B2,C4)", "x":5.5, "y":3},
-                {"label":"K26 (B2,C5)", "x":6.5, "y":3},
-                {"label":"K27 (B2,C6)", "x":7.5, "y":3},
-                {"label":"K28 (B2,C7)", "x":8.5, "y":3},
-                {"label":"K29 (B2,D0)", "x":9.5, "y":3},
-                {"label":"K2A (B2,D1)", "x":10.5, "y":3},
-                {"label":"K2B (B2,D2)", "x":11.5, "y":3},
-                {"label":"K2C (B2,D3)", "x":12.5, "y":3},
-                {"label":"K2D (B2,D4)", "x":13.5, "y":3, "w":1.5},
-                {"label":"K2E (B2,D5)", "x":15.5, "y":3},
-                {"label":"K2F (B2,D6)", "x":16.5, "y":3},
-                {"label":"K2G (B2,D7)", "x":17.5, "y":3},
-                {"label":"K2H (B2,E0)", "x":18.5, "y":3},
-                {"label":"K30 (B3,B7)", "x":0, "y":4, "w":1.75},
-                {"label":"K31 (B3,C0)", "x":1.75, "y":4},
-                {"label":"K32 (B3,C1)", "x":2.75, "y":4},
-                {"label":"K33 (B3,C2)", "x":3.75, "y":4},
-                {"label":"K34 (B3,C3)", "x":4.75, "y":4},
-                {"label":"K35 (B3,C4)", "x":5.75, "y":4},
-                {"label":"K36 (B3,C5)", "x":6.75, "y":4},
-                {"label":"K37 (B3,C6)", "x":7.75, "y":4},
-                {"label":"K38 (B3,C7)", "x":8.75, "y":4},
-                {"label":"K39 (B3,D0)", "x":9.75, "y":4},
-                {"label":"K3A (B3,D1)", "x":10.75, "y":4},
-                {"label":"K3B (B3,D2)", "x":11.75, "y":4},
-                {"label":"K3C (B3,D3)", "x":12.75, "y":4},
-                {"label":"K3D (B3,D4)", "x":13.75, "y":4, "w":1.25},
-                {"label":"K3E (B3,D5)", "x":15.5, "y":4},
-                {"label":"K3F (B3,D6)", "x":16.5, "y":4},
-                {"label":"K3G (B3,D7)", "x":17.5, "y":4},
-                {"label":"K3H (B3,E0)", "x":18.5, "y":4},
-                {"label":"K40 (B4,B7)", "x":0, "y":5, "w":1.25},
-                {"label":"K41 (B4,C0)", "x":1.25, "y":5},
-                {"label":"K42 (B4,C1)", "x":2.25, "y":5},
-                {"label":"K43 (B4,C2)", "x":3.25, "y":5},
-                {"label":"K44 (B4,C3)", "x":4.25, "y":5},
-                {"label":"K45 (B4,C4)", "x":5.25, "y":5},
-                {"label":"K46 (B4,C5)", "x":6.25, "y":5},
-                {"label":"K47 (B4,C6)", "x":7.25, "y":5},
-                {"label":"K48 (B4,C7)", "x":8.25, "y":5},
-                {"label":"K49 (B4,D0)", "x":9.25, "y":5},
-                {"label":"K4A (B4,D1)", "x":10.25, "y":5},
-                {"label":"K4B (B4,D2)", "x":11.25, "y":5},
-                {"label":"K4C (B4,D3)", "x":12.25, "y":5, "w":1.75},
-                {"label":"K4D (B4,D4)", "x":14.25, "y":5.25},
-                {"label":"K4E (B4,D5)", "x":15.5, "y":5},
-                {"label":"K4F (B4,D6)", "x":16.5, "y":5},
-                {"label":"K4G (B4,D7)", "x":17.5, "y":5},
-                {"label":"K4H (B4,E0)", "x":18.5, "y":5, "h":2},
-                {"label":"K50 (B5,B7)", "x":0, "y":6, "w":1.5},
-                {"label":"K51 (B5,C0)", "x":1.5, "y":6},
-                {"label":"K52 (B5,C1)", "x":2.5, "y":6, "w":1.5},
-                {"label":"K55 (B5,C4)", "x":4, "y":6, "w":6.25},
-                {"label":"K57 (B5,C6)", "x":10.25, "y":6, "w":1.25},
-                {"label":"K58 (B5,C7)", "x":11.5, "y":6, "w":1.5},
-                {"label":"K59 (B5,D0)", "x":13.25, "y":6.25},
-                {"label":"K5A (B5,D1)", "x":14.25, "y":6.25},
-                {"label":"K5B (B5,D2)", "x":15.25, "y":6.25},
-                {"label":"K5C (B5,D3)", "x":16.5, "y":6},
-                {"label":"K5D (B5,D4)", "x":17.5, "y":6}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+
+                {"matrix": [5, 14], "x": 15.5, "y": 1},
+                {"matrix": [5, 15], "x": 16.5, "y": 1},
+                {"matrix": [5, 16], "x": 17.5, "y": 1},
+                {"matrix": [5, 17], "x": 18.5, "y": 1},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [1, 3], "x": 3, "y": 2},
+                {"matrix": [1, 4], "x": 4, "y": 2},
+                {"matrix": [1, 5], "x": 5, "y": 2},
+                {"matrix": [1, 6], "x": 6, "y": 2},
+                {"matrix": [1, 7], "x": 7, "y": 2},
+                {"matrix": [1, 8], "x": 8, "y": 2},
+                {"matrix": [1, 9], "x": 9, "y": 2},
+                {"matrix": [1, 10], "x": 10, "y": 2},
+                {"matrix": [1, 11], "x": 11, "y": 2},
+                {"matrix": [1, 12], "x": 12, "y": 2},
+                {"matrix": [1, 13], "x": 13, "y": 2},
+                {"matrix": [0, 13], "x": 14, "y": 2},
+
+                {"matrix": [1, 14], "x": 15.5, "y": 2},
+                {"matrix": [1, 15], "x": 16.5, "y": 2},
+                {"matrix": [1, 16], "x": 17.5, "y": 2},
+                {"matrix": [1, 17], "x": 18.5, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 3},
+                {"matrix": [2, 2], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [2, 4], "x": 4.5, "y": 3},
+                {"matrix": [2, 5], "x": 5.5, "y": 3},
+                {"matrix": [2, 6], "x": 6.5, "y": 3},
+                {"matrix": [2, 7], "x": 7.5, "y": 3},
+                {"matrix": [2, 8], "x": 8.5, "y": 3},
+                {"matrix": [2, 9], "x": 9.5, "y": 3},
+                {"matrix": [2, 10], "x": 10.5, "y": 3},
+                {"matrix": [2, 11], "x": 11.5, "y": 3},
+                {"matrix": [2, 12], "x": 12.5, "y": 3},
+                {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.5, "y": 3},
+                {"matrix": [2, 15], "x": 16.5, "y": 3},
+                {"matrix": [2, 16], "x": 17.5, "y": 3},
+                {"matrix": [2, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 4},
+                {"matrix": [3, 2], "x": 2.75, "y": 4},
+                {"matrix": [3, 3], "x": 3.75, "y": 4},
+                {"matrix": [3, 4], "x": 4.75, "y": 4},
+                {"matrix": [3, 5], "x": 5.75, "y": 4},
+                {"matrix": [3, 6], "x": 6.75, "y": 4},
+                {"matrix": [3, 7], "x": 7.75, "y": 4},
+                {"matrix": [3, 8], "x": 8.75, "y": 4},
+                {"matrix": [3, 9], "x": 9.75, "y": 4},
+                {"matrix": [3, 10], "x": 10.75, "y": 4},
+                {"matrix": [3, 11], "x": 11.75, "y": 4},
+                {"matrix": [3, 12], "x": 12.75, "y": 4},
+                {"matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 14], "x": 15.5, "y": 4},
+                {"matrix": [3, 15], "x": 16.5, "y": 4},
+                {"matrix": [3, 16], "x": 17.5, "y": 4},
+                {"matrix": [3, 17], "x": 18.5, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 5},
+                {"matrix": [4, 2], "x": 2.25, "y": 5},
+                {"matrix": [4, 3], "x": 3.25, "y": 5},
+                {"matrix": [4, 4], "x": 4.25, "y": 5},
+                {"matrix": [4, 5], "x": 5.25, "y": 5},
+                {"matrix": [4, 6], "x": 6.25, "y": 5},
+                {"matrix": [4, 7], "x": 7.25, "y": 5},
+                {"matrix": [4, 8], "x": 8.25, "y": 5},
+                {"matrix": [4, 9], "x": 9.25, "y": 5},
+                {"matrix": [4, 10], "x": 10.25, "y": 5},
+                {"matrix": [4, 11], "x": 11.25, "y": 5},
+                {"matrix": [4, 12], "x": 12.25, "y": 5, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 14.25, "y": 5.25},
+
+                {"matrix": [4, 14], "x": 15.5, "y": 5},
+                {"matrix": [4, 15], "x": 16.5, "y": 5},
+                {"matrix": [4, 16], "x": 17.5, "y": 5},
+                {"matrix": [4, 17], "x": 18.5, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 6},
+                {"matrix": [5, 2], "x": 2.5, "y": 6, "w": 1.5},
+                {"matrix": [5, 5], "x": 4, "y": 6, "w": 6.25},
+                {"matrix": [5, 7], "x": 10.25, "y": 6, "w": 1.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 9], "x": 13.25, "y": 6.25},
+                {"matrix": [5, 10], "x": 14.25, "y": 6.25},
+                {"matrix": [5, 11], "x": 15.25, "y": 6.25},
+
+                {"matrix": [5, 12], "x": 16.5, "y": 6},
+                {"matrix": [5, 13], "x": 17.5, "y": 6}
             ]
         }
     }
diff --git a/keyboards/mechlovin/th1800/th1800.h b/keyboards/mechlovin/th1800/th1800.h
deleted file mode 100644
index edd950b76d..0000000000
--- a/keyboards/mechlovin/th1800/th1800.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K09, K0A, K0B, K0C,          K0E, K0F, K0G, K0H, \
-                                                                                 K5E, K5F, K5G, K5H, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D,   K1E, K1F, K1G, K1H, \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, K2H, \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3E, K3F, K3G, K3H, \
-    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D,  K4E, K4F, K4G, K4H, \
-    K50,   K51, K52,                K55,               K57,  K58,     K59, K5A, K5B,  K5C, K5D       \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K3G,   K3H   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G,   K4H   }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G,   K5H   }, \
-}
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json
index d6be668d13..f5ff5420b4 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/info.json
@@ -25,82 +25,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0},
-                {"label":"K01 (B0,B7)", "x":1.25, "y":0},
-                {"label":"K02 (B0,C0)", "x":2.25, "y":0},
-                {"label":"K03 (B0,C1)", "x":3.25, "y":0},
-                {"label":"K04 (B0,C2)", "x":4.25, "y":0},
-                {"label":"K05 (B0,C3)", "x":5.5, "y":0},
-                {"label":"K06 (B0,C4)", "x":6.5, "y":0},
-                {"label":"K07 (B0,C5)", "x":7.5, "y":0},
-                {"label":"K08 (B0,C6)", "x":8.5, "y":0},
-                {"label":"K09 (B0,C7)", "x":9.75, "y":0},
-                {"label":"K0A (B0,D0)", "x":10.75, "y":0},
-                {"label":"K0B (B0,D1)", "x":11.75, "y":0},
-                {"label":"K0C (B0,D2)", "x":12.75, "y":0},
-                {"label":"K0D (B0,B0)", "x":14, "y":0},
-                {"label":"K10 (B1,B6)", "x":0, "y":1},
-                {"label":"K11 (B1,B7)", "x":1, "y":1},
-                {"label":"K12 (B1,C0)", "x":2, "y":1},
-                {"label":"K13 (B1,C1)", "x":3, "y":1},
-                {"label":"K14 (B1,C2)", "x":4, "y":1},
-                {"label":"K15 (B1,C3)", "x":5, "y":1},
-                {"label":"K16 (B1,C4)", "x":6, "y":1},
-                {"label":"K17 (B1,C5)", "x":7, "y":1},
-                {"label":"K18 (B1,C6)", "x":8, "y":1},
-                {"label":"K19 (B1,C7)", "x":9, "y":1},
-                {"label":"K1A (B1,D0)", "x":10, "y":1},
-                {"label":"K1B (B1,D1)", "x":11, "y":1},
-                {"label":"K1C (B1,D2)", "x":12, "y":1},
-                {"label":"K1D (B1,B0)", "x":13, "y":1},
-                {"label":"K2D (B2,B0)", "x":14, "y":1},
-                {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (B2,B7)", "x":1.5, "y":2},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2},
-                {"label":"K3C (B3,D2)", "x":13.5, "y":2, "w":1.5},
-                {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75},
-                {"label":"K31 (B3,B7)", "x":1.75, "y":3},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3},
-                {"label":"K3D (B3,B0)", "x":12.75, "y":3, "w":2.25},
-                {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25},
-                {"label":"K41 (B4,B7)", "x":2.25, "y":4},
-                {"label":"K42 (B4,C0)", "x":3.25, "y":4},
-                {"label":"K43 (B4,C1)", "x":4.25, "y":4},
-                {"label":"K44 (B4,C2)", "x":5.25, "y":4},
-                {"label":"K45 (B4,C3)", "x":6.25, "y":4},
-                {"label":"K46 (B4,C4)", "x":7.25, "y":4},
-                {"label":"K47 (B4,C5)", "x":8.25, "y":4},
-                {"label":"K48 (B4,C6)", "x":9.25, "y":4},
-                {"label":"K49 (B4,C7)", "x":10.25, "y":4},
-                {"label":"K4A (B4,D0)", "x":11.25, "y":4},
-                {"label":"K4B (B4,D1)", "x":12.25, "y":4, "w":1.75},
-                {"label":"K4C (B4,D2)", "x":14, "y":4},
-                {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5},
-                {"label":"K51 (B5,B7)", "x":1.5, "y":5},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5},
-                {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7},
-                {"label":"K5A (B5,D0)", "x":11, "y":5, "w":1.5},
-                {"label":"K5B (B5,D1)", "x":12.5, "y":5},
-                {"label":"K5C (B5,D2)", "x":13.5, "y":5, "w":1.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [2, 13], "x": 14, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [3, 12], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5, "w": 7},
+                {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5},
+                {"matrix": [5, 12], "x": 12.5, "y": 5},
+                {"matrix": [5, 13], "x": 13.5, "y": 5, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h
deleted file mode 100644
index 3d30e61d89..0000000000
--- a/keyboards/mechlovin/tmkl/tmkl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    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, K2D,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,     \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,          \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,     \
-    K50, K51, K52,                K56,                K5B, K5C, K5D           \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D   }, \
-    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, KC_NO, K5B,   K5C,   K5D   }, \
-}