Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 314 insertions, 412 deletions

diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
index 4b1f158717..38152a32e6 100644
--- a/keyboards/gon/nerd60/info.json
+++ b/keyboards/gon/nerd60/info.json
@@ -25,356 +25,356 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K80", "x":0, "y":0},
-                {"label":"K10", "x":1, "y":0},
-                {"label":"K01", "x":2, "y":0},
-                {"label":"K11", "x":3, "y":0},
-                {"label":"K02", "x":4, "y":0},
-                {"label":"K12", "x":5, "y":0},
-                {"label":"K03", "x":6, "y":0},
-                {"label":"K13", "x":7, "y":0},
-                {"label":"K04", "x":8, "y":0},
-                {"label":"K14", "x":9, "y":0},
-                {"label":"K05", "x":10, "y":0},
-                {"label":"K15", "x":11, "y":0},
-                {"label":"K06", "x":12, "y":0},
-                {"label":"K17", "x":13, "y":0},
-                {"label":"K16", "x":14, "y":0},
+                {"matrix": [8, 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": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
 
-                {"label":"K20", "x":0, "y":1, "w":1.5},
-                {"label":"K30", "x":1.5, "y":1},
-                {"label":"K21", "x":2.5, "y":1},
-                {"label":"K31", "x":3.5, "y":1},
-                {"label":"K22", "x":4.5, "y":1},
-                {"label":"K32", "x":5.5, "y":1},
-                {"label":"K23", "x":6.5, "y":1},
-                {"label":"K33", "x":7.5, "y":1},
-                {"label":"K24", "x":8.5, "y":1},
-                {"label":"K34", "x":9.5, "y":1},
-                {"label":"K25", "x":10.5, "y":1},
-                {"label":"K35", "x":11.5, "y":1},
-                {"label":"K26", "x":12.5, "y":1},
-                {"label":"K36", "x":13.5, "y":1, "w":1.5},
+                {"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": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"label":"K40", "x":0, "y":2, "w":1.75},
-                {"label":"K41", "x":1.75, "y":2},
-                {"label":"K51", "x":2.75, "y":2},
-                {"label":"K42", "x":3.75, "y":2},
-                {"label":"K52", "x":4.75, "y":2},
-                {"label":"K43", "x":5.75, "y":2},
-                {"label":"K53", "x":6.75, "y":2},
-                {"label":"K44", "x":7.75, "y":2},
-                {"label":"K54", "x":8.75, "y":2},
-                {"label":"K45", "x":9.75, "y":2},
-                {"label":"K55", "x":10.75, "y":2},
-                {"label":"K46", "x":11.75, "y":2},
-                {"label":"K56", "x":12.75, "y":2, "w":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"label":"K70", "x":0, "y":3, "w":1.25},
-                {"label":"K97", "x":1.25, "y":3},
-                {"label":"K61", "x":2.25, "y":3},
-                {"label":"K71", "x":3.25, "y":3},
-                {"label":"K62", "x":4.25, "y":3},
-                {"label":"K72", "x":5.25, "y":3},
-                {"label":"K63", "x":6.25, "y":3},
-                {"label":"K73", "x":7.25, "y":3},
-                {"label":"K64", "x":8.25, "y":3},
-                {"label":"K74", "x":9.25, "y":3},
-                {"label":"K65", "x":10.25, "y":3},
-                {"label":"K75", "x":11.25, "y":3},
-                {"label":"K66", "x":12.25, "y":3, "w":1.75},
-                {"label":"K76", "x":14, "y":3},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"label":"K60", "x":0, "y":4, "w":1.25},
-                {"label":"K50", "x":1.25, "y":4, "w":1.25},
-                {"label":"K87", "x":2.5, "y":4, "w":1.25},
-                {"label":"K07", "x":3.75, "y":4, "w":6.25},
-                {"label":"K27", "x":10, "y":4, "w":1.25},
-                {"label":"K37", "x":11.25, "y":4, "w":1.25},
-                {"label":"K47", "x":12.5, "y":4, "w":1.25},
-                {"label":"K57", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [8, 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": [1, 6], "x": 13, "y": 0, "w": 2},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"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": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [8, 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": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
+                {"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": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
+                {"matrix": [8, 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": [1, 6], "x": 13, "y": 0, "w": 2},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "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": [2, 6], "x": 12.5, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_iso_split_bs_rshift": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
+                {"matrix": [8, 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": [1, 7], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
 
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "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": [2, 6], "x": 12.5, "y": 1},
 
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [5, 1], "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "x": 3.75, "y": 2},
+                {"matrix": [5, 2], "x": 4.75, "y": 2},
+                {"matrix": [4, 3], "x": 5.75, "y": 2},
+                {"matrix": [5, 3], "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [4, 5], "x": 9.75, "y": 2},
+                {"matrix": [5, 5], "x": 10.75, "y": 2},
+                {"matrix": [4, 6], "x": 11.75, "y": 2},
+                {"matrix": [3, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"x":0, "y":3, "w":1.25},
-                {"x":1.25, "y":3},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
+                {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [9, 7], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
 
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [0, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [2, 7], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [3, 7], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/gon/nerd60/nerd60.h b/keyboards/gon/nerd60/nerd60.h
deleted file mode 100644
index 03a3ffe907..0000000000
--- a/keyboards/gon/nerd60/nerd60.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
-    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
-    K60, K50, K87,                K07,                K27, K37, K47, K57  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO }, \
-    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K97   } \
-}
-
-#define LAYOUT_60_ansi( \
-    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
-    K70,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
-    K60, K50, K87,                K07,                K27, K37, K47, K57  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   KC_NO, KC_NO }, \
-    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_60_ansi_split_bs_rshift( \
-    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K56, \
-    K70,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
-    K60, K50, K87,                K07,                K27, K37, K47, K57  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO }, \
-    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_60_iso( \
-    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K36, K56, \
-    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K66, \
-    K60, K50, K87,                K07,                K27, K37, K47, K57  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   KC_NO, KC_NO }, \
-    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K97   } \
-}
-
-#define LAYOUT_60_iso_split_bs_rshift( \
-    K80, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K17, K16, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26,      \
-    K40, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K36, K56, \
-    K70, K97, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
-    K60, K50, K87,                K07,                K27, K37, K47, K57  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04,   K05,   K06,   K07   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   KC_NO }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO }, \
-    { K80,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K87   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K97   } \
-}