Move 65% layouts to data driven (#20308)

2 files changed, 272 insertions, 356 deletions

diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json
index 728de231f5..76ad8fda50 100644
--- a/keyboards/pizzakeyboards/pizza65/info.json
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -18,306 +18,306 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"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, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"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, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"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": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [1, 14], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"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, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"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, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pizzakeyboards/pizza65/pizza65.h b/keyboards/pizzakeyboards/pizza65/pizza65.h
deleted file mode 100644
index 74f1223be2..0000000000
--- a/keyboards/pizzakeyboards/pizza65/pizza65.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2020 mmonte
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_65_ansi_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_iso_blocker( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_ansi_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}
-
-#define LAYOUT_65_iso_blocker_split_bs( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-    K40, K41, K42,                K46,                K4A, K4B,      K4D, K4E, K4F \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, KC_NO, K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K2D, K1F }, \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-    { K30, K31,   K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-    { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E, K4F } \
-}