Move 65% layouts to data driven (#20308)

3 files changed, 206 insertions, 302 deletions

diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index cf337c55f5..264887f7ad 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -31,231 +31,231 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker_split_bs_sp": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0},
-                {"label":"K17 (B2,D3)", "x":14, "y":0},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K82 (F5,B6)", "x":3.75, "y":4, "w":2.25},
-                {"label":"K92 (F4,B6)", "x":6, "y":4, "w":1.25},
-                {"label":"K93 (F4,B5)", "x":7.25, "y":4, "w":2.75},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [9, 2], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0, "w":2},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label":"K00 (B1,C7)", "x":0, "y":0},
-                {"label":"K10 (B2,C7)", "x":1, "y":0},
-                {"label":"K01 (B1,C6)", "x":2, "y":0},
-                {"label":"K11 (B2,C6)", "x":3, "y":0},
-                {"label":"K02 (B1,B6)", "x":4, "y":0},
-                {"label":"K12 (B2,B6)", "x":5, "y":0},
-                {"label":"K03 (B1,B5)", "x":6, "y":0},
-                {"label":"K13 (B2,B5)", "x":7, "y":0},
-                {"label":"K04 (B1,B4)", "x":8, "y":0},
-                {"label":"K14 (B2,B4)", "x":9, "y":0},
-                {"label":"K05 (B1,D7)", "x":10, "y":0},
-                {"label":"K15 (B2,D7)", "x":11, "y":0},
-                {"label":"K06 (B1,D5)", "x":12, "y":0},
-                {"label":"K26 (D1,D5)", "x":13, "y":0},
-                {"label":"K17 (B2,D3)", "x":14, "y":0},
-                {"label":"K07 (B1,D3)", "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [2, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
 
-                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
-                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
-                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
-                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
-                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
-                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
-                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
-                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
-                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
-                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
-                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
-                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
-                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K37 (D2,D3)", "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 6], "x": 12.5, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
-                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
-                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
-                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
-                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
-                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
-                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
-                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
-                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
-                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K57 (D6,D3)", "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
-                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
-                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
-                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
-                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
-                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
-                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
-                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
-                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
-                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
-                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
-                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K77 (F7,D3)", "x":14, "y":3},
-                {"label":"K67 (F6,D3)", "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [7, 0], "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "x": 3.25, "y": 3},
+                {"matrix": [7, 1], "x": 4.25, "y": 3},
+                {"matrix": [6, 2], "x": 5.25, "y": 3},
+                {"matrix": [7, 2], "x": 6.25, "y": 3},
+                {"matrix": [6, 3], "x": 7.25, "y": 3},
+                {"matrix": [7, 3], "x": 8.25, "y": 3},
+                {"matrix": [6, 4], "x": 9.25, "y": 3},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 7], "x": 14, "y": 3},
+                {"matrix": [6, 7], "x": 15, "y": 3},
 
-                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
-                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K95 (F4,D7)", "x":13, "y":4},
-                {"label":"K97 (F4,D3)", "x":14, "y":4},
-                {"label":"K87 (F5,D3)", "x":15, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 7], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.c b/keyboards/sawnsprojects/krush/krush65/solder/solder.c
index 501d70d1bd..db6fec3950 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/solder.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "solder.h"
+#include "quantum.h"
 
    /*  Custom encoder control - handles CW/CCW turning of encoder
      *  Default behavior:
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.h b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
deleted file mode 100644
index 11140aac9c..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.h
+++ /dev/null
@@ -1,96 +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
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
- * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │07 │      │26     │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
- * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │37 │        │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴┐47  │ ISO Enter
- * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │57 │     │46 │    │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤     └───┴────┘
- * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75    │77 │67 │
- * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │80  │90  │81  │82      │92  │93        │94  │85  │ │95 │97 │87 │ Split Spacebar
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────┐
- * │80  │90  │81  │92                      │94  │85  │ Standard
- * └────┴────┴────┴────────────────────────┴────┴────┘
- * ┌─────┬───┬─────┬───────────────────────────┬─────┐
- * │80   │90 │81   │92                         │85   │ Tsangan
- * └─────┴───┴─────┴───────────────────────────┴─────┘
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-#define LAYOUT_65_ansi_blocker_split_bs_sp( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
-    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81,           K82, K92, K93,      K94, K85,      K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
-    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, K82, XXX, XXX, K85, XXX, K87 }, \
-    { K90, XXX, K92, K93, K94, K95, XXX, K97 }, \
-}