Move single `LAYOUT_all`s to data driven (#20430)

4 files changed, 178 insertions, 240 deletions

diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json
index f7892d0286..acb401b361 100644
--- a/keyboards/sawnsprojects/amber80/solder/info.json
+++ b/keyboards/sawnsprojects/amber80/solder/info.json
@@ -26,96 +26,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (B1,F4)", "x": 0, "y": 0 },
-                { "label": "K10 (B2,F4)", "x": 1.25, "y": 0 },
-                { "label": "K01 (B1,F6)", "x": 2.25, "y": 0 },
-                { "label": "K11 (B2,F6)", "x": 3.25, "y": 0 },
-                { "label": "K02 (B1,F7)", "x": 4.25, "y": 0 },
-                { "label": "K12 (B2,F7)", "x": 5.5, "y": 0 },
-                { "label": "K03 (B1,C7)", "x": 6.5, "y": 0 },
-                { "label": "K13 (B2,C7)", "x": 7.5, "y": 0 },
-                { "label": "K04 (B1,C6)", "x": 8.5, "y": 0 },
-                { "label": "K14 (B2,C6)", "x": 9.75, "y": 0 },
-                { "label": "K05 (B1,B6)", "x": 10.75, "y": 0 },
-                { "label": "K15 (B2,B6)", "x": 11.75, "y": 0 },
-                { "label": "K06 (B1,B5)", "x": 12.75, "y": 0 },
-                { "label": "K16 (B2,B5)", "x": 14, "y": 0 },
-                { "label": "K17 (B2,D6)", "x": 15.25, "y": 0 },
-                { "label": "K08 (B1,D4)", "x": 16.25, "y": 0 },
-                { "label": "K18 (B2,D4)", "x": 17.25, "y": 0 },
-                { "label": "K20 (B3,F4)", "x": 0, "y": 1.25 },
-                { "label": "K30 (B7,F4)", "x": 1, "y": 1.25 },
-                { "label": "K21 (B3,F6)", "x": 2, "y": 1.25 },
-                { "label": "K31 (B7,F6)", "x": 3, "y": 1.25 },
-                { "label": "K22 (B3,F7)", "x": 4, "y": 1.25 },
-                { "label": "K32 (B7,F7)", "x": 5, "y": 1.25 },
-                { "label": "K23 (B3,C7)", "x": 6, "y": 1.25 },
-                { "label": "K33 (B7,C7)", "x": 7, "y": 1.25 },
-                { "label": "K24 (B3,C6)", "x": 8, "y": 1.25 },
-                { "label": "K34 (B7,C6)", "x": 9, "y": 1.25 },
-                { "label": "K25 (B3,B6)", "x": 10, "y": 1.25 },
-                { "label": "K35 (B7,B6)", "x": 11, "y": 1.25 },
-                { "label": "K26 (B3,B5)", "x": 12, "y": 1.25 },
-                { "label": "K36 (B7,B5)", "x": 13, "y": 1.25 },
-                { "label": "K27 (B3,D6)", "x": 14, "y": 1.25 },
-                { "label": "K37 (B7,D6)", "x": 15.25, "y": 1.25 },
-                { "label": "K28 (B3,D4)", "x": 16.25, "y": 1.25 },
-                { "label": "K38 (B7,D4)", "x": 17.25, "y": 1.25 },
-                { "label": "K40 (D0,F4)", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "K50 (D1,F4)", "x": 1.5, "y": 2.25 },
-                { "label": "K41 (D0,F6)", "x": 2.5, "y": 2.25 },
-                { "label": "K51 (D1,F6)", "x": 3.5, "y": 2.25 },
-                { "label": "K42 (D0,F7)", "x": 4.5, "y": 2.25 },
-                { "label": "K52 (D1,F7)", "x": 5.5, "y": 2.25 },
-                { "label": "K43 (D0,C7)", "x": 6.5, "y": 2.25 },
-                { "label": "K53 (D1,C7)", "x": 7.5, "y": 2.25 },
-                { "label": "K44 (D0,C6)", "x": 8.5, "y": 2.25 },
-                { "label": "K54 (D1,C6)", "x": 9.5, "y": 2.25 },
-                { "label": "K45 (D0,B6)", "x": 10.5, "y": 2.25 },
-                { "label": "K55 (D1,B6)", "x": 11.5, "y": 2.25 },
-                { "label": "K46 (D0,B5)", "x": 12.5, "y": 2.25 },
-                { "label": "K56 (D1,B5)", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "K57 (D1,D6)", "x": 15.25, "y": 2.25 },
-                { "label": "K48 (D0,D4)", "x": 16.25, "y": 2.25 },
-                { "label": "K58 (D1,D4)", "x": 17.25, "y": 2.25 },
-                { "label": "K60 (F1,F4)", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "K70 (F0,F4)", "x": 1.75, "y": 3.25 },
-                { "label": "K61 (F1,F6)", "x": 2.75, "y": 3.25 },
-                { "label": "K71 (F0,F6)", "x": 3.75, "y": 3.25 },
-                { "label": "K62 (F1,F7)", "x": 4.75, "y": 3.25 },
-                { "label": "K72 (F0,F7)", "x": 5.75, "y": 3.25 },
-                { "label": "K63 (F1,C7)", "x": 6.75, "y": 3.25 },
-                { "label": "K73 (F0,C7)", "x": 7.75, "y": 3.25 },
-                { "label": "K64 (F1,C6)", "x": 8.75, "y": 3.25 },
-                { "label": "K74 (F0,C6)", "x": 9.75, "y": 3.25 },
-                { "label": "K65 (F1,B6)", "x": 10.75, "y": 3.25 },
-                { "label": "K75 (F0,B6)", "x": 11.75, "y": 3.25 },
-                { "label": "K76 (F0,B5)", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "K80 (D7,F4)", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "K90 (B4,F4)", "x": 1.25, "y": 4.25 },
-                { "label": "K81 (D7,F6)", "x": 2.25, "y": 4.25 },
-                { "label": "K91 (B4,F6)", "x": 3.25, "y": 4.25 },
-                { "label": "K82 (D7,F7)", "x": 4.25, "y": 4.25 },
-                { "label": "K92 (B4,F7)", "x": 5.25, "y": 4.25 },
-                { "label": "K83 (D7,C7)", "x": 6.25, "y": 4.25 },
-                { "label": "K93 (B4,C7)", "x": 7.25, "y": 4.25 },
-                { "label": "K84 (D7,C6)", "x": 8.25, "y": 4.25 },
-                { "label": "K94 (B4,C6)", "x": 9.25, "y": 4.25 },
-                { "label": "K85 (D7,B6)", "x": 10.25, "y": 4.25 },
-                { "label": "K95 (B4,B6)", "x": 11.25, "y": 4.25 },
-                { "label": "K86 (D7,B5)", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "K96 (B4,B5)", "x": 14, "y": 4.25 },
-                { "label": "K88 (D7,D4)", "x": 16.25, "y": 4.25 },
-                { "label": "KA0 (D5,F4)", "x": 0, "y": 5.25, "w": 1.5 },
-                { "label": "KB0 (D3,F4)", "x": 1.5, "y": 5.25 },
-                { "label": "KA1 (D5,F6)", "x": 2.5, "y": 5.25, "w": 1.5 },
-                { "label": "KB3 (D3,C7)", "x": 4, "y": 5.25, "w": 7 },
-                { "label": "KA6 (D5,B5)", "x": 11, "y": 5.25, "w": 1.5 },
-                { "label": "KB6 (D3,B5)", "x": 12.5, "y": 5.25 },
-                { "label": "KA7 (D5,D6)", "x": 13.5, "y": 5.25, "w": 1.5 },
-                { "label": "KB7 (D3,D6)", "x": 15.25, "y": 5.25 },
-                { "label": "KA8 (D5,D4)", "x": 16.25, "y": 5.25 },
-                { "label": "KB8 (D3,D4)", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7},
+                {"matrix": [10, 6], "x": 11, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 6], "x": 12.5, "y": 5.25},
+                {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/amber80/solder/solder.h b/keyboards/sawnsprojects/amber80/solder/solder.h
deleted file mode 100644
index 9f76795162..0000000000
--- a/keyboards/sawnsprojects/amber80/solder/solder.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2022 SawnsProjects
- *
- * 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, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K88, \
-    KA0, KB0, KA1, KB3, KA6, KB6, KA7, KB7, KA8, KB8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, XXX, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, XXX, XXX }, \
-    { K70, K71, K72, K73, K74, K75, K76, XXX, XXX }, \
-    { K80, K81, K82, K83, K84, K85, K86, XXX, K88 }, \
-    { K90, K91, K92, K93, K94, K95, K96, XXX, XXX }, \
-    { KA0, KA1, XXX, XXX, XXX, XXX, KA6, KA7, KA8 }, \
-    { KB0, XXX, XXX, KB3, XXX, XXX, KB6, KB7, KB8 }, \
-}
-
diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json
index d91101d107..bdc72025a2 100644
--- a/keyboards/sawnsprojects/vcl65/solder/info.json
+++ b/keyboards/sawnsprojects/vcl65/solder/info.json
@@ -25,76 +25,80 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00 (F6,B2)", "x": 0, "y": 0 },
-                { "label": "K01 (F6,B5)", "x": 1, "y": 0 },
-                { "label": "K02 (F6,F5)", "x": 2, "y": 0 },
-                { "label": "K03 (F6,C7)", "x": 3, "y": 0 },
-                { "label": "K04 (F6,B4)", "x": 4, "y": 0 },
-                { "label": "K05 (F6,C6)", "x": 5, "y": 0 },
-                { "label": "K06 (F6,D7)", "x": 6, "y": 0 },
-                { "label": "K07 (F6,D6)", "x": 7, "y": 0 },
-                { "label": "K08 (F6,D4)", "x": 8, "y": 0 },
-                { "label": "K09 (F6,D5)", "x": 9, "y": 0 },
-                { "label": "K0A (F6,D3)", "x": 10, "y": 0 },
-                { "label": "K0B (F6,D2)", "x": 11, "y": 0 },
-                { "label": "K0C (F6,B6)", "x": 12, "y": 0 },
-                { "label": "K0D (F6,D1)", "x": 13, "y": 0 },
-                { "label": "K2C (F4,B6)", "x": 14, "y": 0 },
-                { "label": "K0E (F6,D0)", "x": 15, "y": 0 },
-                { "label": "K10 (F7,B2)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (F7,B5)", "x": 1.5, "y": 1 },
-                { "label": "K12 (F7,F5)", "x": 2.5, "y": 1 },
-                { "label": "K13 (F7,C7)", "x": 3.5, "y": 1 },
-                { "label": "K14 (F7,B4)", "x": 4.5, "y": 1 },
-                { "label": "K15 (F7,C6)", "x": 5.5, "y": 1 },
-                { "label": "K16 (F7,D7)", "x": 6.5, "y": 1 },
-                { "label": "K17 (F7,D6)", "x": 7.5, "y": 1 },
-                { "label": "K18 (F7,D4)", "x": 8.5, "y": 1 },
-                { "label": "K19 (F7,D5)", "x": 9.5, "y": 1 },
-                { "label": "K1A (F7,D3)", "x": 10.5, "y": 1 },
-                { "label": "K1B (F7,D2)", "x": 11.5, "y": 1 },
-                { "label": "K1C (F7,B6)", "x": 12.5, "y": 1 },
-                { "label": "K1D (F7,D1)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (F7,D0)", "x": 15, "y": 1 },
-                { "label": "K20 (F4,B2)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (F4,B5)", "x": 1.75, "y": 2 },
-                { "label": "K22 (F4,F5)", "x": 2.75, "y": 2 },
-                { "label": "K23 (F4,C7)", "x": 3.75, "y": 2 },
-                { "label": "K24 (F4,B4)", "x": 4.75, "y": 2 },
-                { "label": "K25 (F4,C6)", "x": 5.75, "y": 2 },
-                { "label": "K26 (F4,D7)", "x": 6.75, "y": 2 },
-                { "label": "K27 (F4,D6)", "x": 7.75, "y": 2 },
-                { "label": "K28 (F4,D4)", "x": 8.75, "y": 2 },
-                { "label": "K29 (F4,D5)", "x": 9.75, "y": 2 },
-                { "label": "K2A (F4,D3)", "x": 10.75, "y": 2 },
-                { "label": "K2B (F4,D2)", "x": 11.75, "y": 2 },
-                { "label": "K2D (F4,D1)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (F4,D0)", "x": 15, "y": 2 },
-                { "label": "K30 (B0,B2)", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "K31 (B0,B5)", "x": 1.25, "y": 3 },
-                { "label": "K32 (B0,F5)", "x": 2.25, "y": 3 },
-                { "label": "K33 (B0,C7)", "x": 3.25, "y": 3 },
-                { "label": "K34 (B0,B4)", "x": 4.25, "y": 3 },
-                { "label": "K35 (B0,C6)", "x": 5.25, "y": 3 },
-                { "label": "K36 (B0,D7)", "x": 6.25, "y": 3 },
-                { "label": "K37 (B0,D6)", "x": 7.25, "y": 3 },
-                { "label": "K38 (B0,D4)", "x": 8.25, "y": 3 },
-                { "label": "K39 (B0,D5)", "x": 9.25, "y": 3 },
-                { "label": "K3A (B0,D3)", "x": 10.25, "y": 3 },
-                { "label": "K3B (B0,D2)", "x": 11.25, "y": 3 },
-                { "label": "K3C (B0,B6)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (B0,D1)", "x": 14, "y": 3 },
-                { "label": "K3E (B0,D0)", "x": 15, "y": 3 },
-                { "label": "K40 (B1,B2)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (B1,B5)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42 (B1,F5)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K46 (B1,D7)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K49 (B1,D5)", "x": 10, "y": 4 },
-                { "label": "K4A (B1,D3)", "x": 11, "y": 4 },
-                { "label": "K4B (B1,D2)", "x": 12, "y": 4 },
-                { "label": "K4C (B1,B6)", "x": 13, "y": 4 },
-                { "label": "K4D (B1,D1)", "x": 14, "y": 4 },
-                { "label": "K4E (B1,D0)", "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/vcl65/solder/solder.h b/keyboards/sawnsprojects/vcl65/solder/solder.h
deleted file mode 100644
index 8c150a1b96..0000000000
--- a/keyboards/sawnsprojects/vcl65/solder/solder.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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, K0B, K0C, K0D, K2C, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }, \
-}
-