Move 65% layouts to data driven (#20308)

4 files changed, 527 insertions, 292 deletions

diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index 038fbc3ca5..eda564e4ed 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -23,84 +23,238 @@
     "bootloader": "usbasploader",
     "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
+                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
+                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
+                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
+                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
+                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
+                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
+                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
+                {"label": "K1D", "matrix": [1, 13], "x": 28, "y": 0},
+                {"label": "K1E", "matrix": [1, 14], "x": 29, "y": 0},
+
+                {"label": "K20", "matrix": [2, 0], "x": 30, "y": 0},
+                {"label": "K21", "matrix": [2, 1], "x": 31, "y": 0},
+                {"label": "K22", "matrix": [2, 2], "x": 32, "y": 0},
+                {"label": "K23", "matrix": [2, 3], "x": 33, "y": 0},
+                {"label": "K24", "matrix": [2, 4], "x": 34, "y": 0},
+                {"label": "K25", "matrix": [2, 5], "x": 35, "y": 0},
+                {"label": "K26", "matrix": [2, 6], "x": 36, "y": 0},
+                {"label": "K27", "matrix": [2, 7], "x": 37, "y": 0},
+                {"label": "K28", "matrix": [2, 8], "x": 38, "y": 0},
+                {"label": "K29", "matrix": [2, 9], "x": 39, "y": 0},
+                {"label": "K2A", "matrix": [2, 10], "x": 40, "y": 0},
+                {"label": "K2B", "matrix": [2, 11], "x": 41, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 42, "y": 0},
+                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+
+                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
+                {"label": "K32", "matrix": [3, 2], "x": 45, "y": 0},
+                {"label": "K33", "matrix": [3, 3], "x": 46, "y": 0},
+                {"label": "K34", "matrix": [3, 4], "x": 47, "y": 0},
+                {"label": "K35", "matrix": [3, 5], "x": 48, "y": 0},
+                {"label": "K36", "matrix": [3, 6], "x": 49, "y": 0},
+                {"label": "K37", "matrix": [3, 7], "x": 50, "y": 0},
+                {"label": "K38", "matrix": [3, 8], "x": 51, "y": 0},
+                {"label": "K39", "matrix": [3, 9], "x": 52, "y": 0},
+                {"label": "K3A", "matrix": [3, 10], "x": 53, "y": 0},
+                {"label": "K3B", "matrix": [3, 11], "x": 54, "y": 0},
+                {"label": "K3C", "matrix": [3, 12], "x": 55, "y": 0},
+                {"label": "K3D", "matrix": [3, 13], "x": 56, "y": 0},
+                {"label": "K3E", "matrix": [3, 14], "x": 57, "y": 0},
+
+                {"label": "K40", "matrix": [4, 0], "x": 58, "y": 0},
+                {"label": "K41", "matrix": [4, 1], "x": 59, "y": 0},
+                {"label": "K42", "matrix": [4, 2], "x": 60, "y": 0},
+                {"label": "K46", "matrix": [4, 6], "x": 61, "y": 0},
+                {"label": "K49", "matrix": [4, 9], "x": 62, "y": 0},
+                {"label": "K4A", "matrix": [4, 10], "x": 63, "y": 0},
+                {"label": "K4B", "matrix": [4, 11], "x": 64, "y": 0},
+                {"label": "K4C", "matrix": [4, 12], "x": 65, "y": 0},
+                {"label": "K4D", "matrix": [4, 13], "x": 66, "y": 0},
+                {"label": "K4E", "matrix": [4, 14], "x": 67, "y": 0}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+
+                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
+                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
+                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
+                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
+                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
+                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
+                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
+                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
+                {"label": "K1E", "matrix": [1, 14], "x": 28, "y": 0},
+
+                {"label": "K20", "matrix": [2, 0], "x": 29, "y": 0},
+                {"label": "K21", "matrix": [2, 1], "x": 30, "y": 0},
+                {"label": "K22", "matrix": [2, 2], "x": 31, "y": 0},
+                {"label": "K23", "matrix": [2, 3], "x": 32, "y": 0},
+                {"label": "K24", "matrix": [2, 4], "x": 33, "y": 0},
+                {"label": "K25", "matrix": [2, 5], "x": 34, "y": 0},
+                {"label": "K26", "matrix": [2, 6], "x": 35, "y": 0},
+                {"label": "K27", "matrix": [2, 7], "x": 36, "y": 0},
+                {"label": "K28", "matrix": [2, 8], "x": 37, "y": 0},
+                {"label": "K29", "matrix": [2, 9], "x": 38, "y": 0},
+                {"label": "K2A", "matrix": [2, 10], "x": 39, "y": 0},
+                {"label": "K2B", "matrix": [2, 11], "x": 40, "y": 0},
+                {"label": "K2D", "matrix": [2, 13], "x": 41, "y": 0},
+                {"label": "K1D", "matrix": [1, 13], "x": 42, "y": 0},
+                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+
+                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
+                {"label": "K31", "matrix": [3, 1], "x": 45, "y": 0},
+                {"label": "K32", "matrix": [3, 2], "x": 46, "y": 0},
+                {"label": "K33", "matrix": [3, 3], "x": 47, "y": 0},
+                {"label": "K34", "matrix": [3, 4], "x": 48, "y": 0},
+                {"label": "K35", "matrix": [3, 5], "x": 49, "y": 0},
+                {"label": "K36", "matrix": [3, 6], "x": 50, "y": 0},
+                {"label": "K37", "matrix": [3, 7], "x": 51, "y": 0},
+                {"label": "K38", "matrix": [3, 8], "x": 52, "y": 0},
+                {"label": "K39", "matrix": [3, 9], "x": 53, "y": 0},
+                {"label": "K3A", "matrix": [3, 10], "x": 54, "y": 0},
+                {"label": "K3B", "matrix": [3, 11], "x": 55, "y": 0},
+                {"label": "K3C", "matrix": [3, 12], "x": 56, "y": 0},
+                {"label": "K3D", "matrix": [3, 13], "x": 57, "y": 0},
+                {"label": "K3E", "matrix": [3, 14], "x": 58, "y": 0},
+
+                {"label": "K40", "matrix": [4, 0], "x": 59, "y": 0},
+                {"label": "K41", "matrix": [4, 1], "x": 60, "y": 0},
+                {"label": "K42", "matrix": [4, 2], "x": 61, "y": 0},
+                {"label": "K46", "matrix": [4, 6], "x": 62, "y": 0},
+                {"label": "K49", "matrix": [4, 9], "x": 63, "y": 0},
+                {"label": "K4A", "matrix": [4, 10], "x": 64, "y": 0},
+                {"label": "K4B", "matrix": [4, 11], "x": 65, "y": 0},
+                {"label": "K4C", "matrix": [4, 12], "x": 66, "y": 0},
+                {"label": "K4D", "matrix": [4, 13], "x": 67, "y": 0},
+                {"label": "K4E", "matrix": [4, 14], "x": 68, "y": 0}
+            ]
+        },
         "LAYOUT_encoder": {
             "layout": [
-                {"x": 1,"y": 0},
-                {"x": 14,"y": 0},
+                {"label": "K44", "matrix": [4, 4], "x": 1, "y": 0},
+
+                {"label": "K48", "matrix": [4, 8], "x": 14, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 1},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 1},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 1},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 1},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 1},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 1},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 1},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 1},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 1},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 1},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 1},
+                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 1},
+                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 1},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 1, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 1},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 15, "y": 2},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 2},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 2},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 2},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 2},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 2},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 2},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 2},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 2},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 2},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 2},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 2},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 2},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 2},
 
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3},
-                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
-                {"x": 15, "y": 3},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 3},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 3},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 3},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 3},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 3},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 3},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 3},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 3},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 3},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 3},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 3},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 3},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 4},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 4},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 4},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 4},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 4},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 4},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 4},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 4},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 4},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 4},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 4},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 4},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 4},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 4},
 
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 6.25},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 5},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 5},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 5},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 5},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 5},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/tkw/stoutgat/v1/v1.h b/keyboards/tkw/stoutgat/v1/v1.h
deleted file mode 100644
index 7c8c715748..0000000000
--- a/keyboards/tkw/stoutgat/v1/v1.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * 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 _x_ KC_NO
-
-/* 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_encoder( \
-       K44,                                                        K48, \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, K44, _x_, K46, _x_, K48, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 928dd8acd7..b0d6cc321c 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -24,83 +24,310 @@
     },
     "community_layouts": ["65_iso", "65_ansi"],
     "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"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": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 13], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+
+                {"matrix": [4, 0], "x": 58, "y": 0},
+                {"matrix": [4, 1], "x": 59, "y": 0},
+                {"matrix": [4, 2], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 9], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 11], "x": 64, "y": 0},
+                {"matrix": [4, 12], "x": 65, "y": 0},
+                {"matrix": [4, 13], "x": 66, "y": 0},
+                {"matrix": [4, 14], "x": 67, "y": 0}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"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": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+
+                {"matrix": [2, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+
+                {"matrix": [4, 0], "x": 58, "y": 0},
+                {"matrix": [4, 1], "x": 59, "y": 0},
+                {"matrix": [4, 2], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 9], "x": 62, "y": 0},
+                {"matrix": [4, 11], "x": 63, "y": 0},
+                {"matrix": [4, 12], "x": 64, "y": 0},
+                {"matrix": [4, 13], "x": 65, "y": 0},
+                {"matrix": [4, 14], "x": 66, "y": 0}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"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": [1, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 14], "x": 28, "y": 0},
+
+                {"matrix": [2, 0], "x": 29, "y": 0},
+                {"matrix": [2, 1], "x": 30, "y": 0},
+                {"matrix": [2, 2], "x": 31, "y": 0},
+                {"matrix": [2, 3], "x": 32, "y": 0},
+                {"matrix": [2, 4], "x": 33, "y": 0},
+                {"matrix": [2, 5], "x": 34, "y": 0},
+                {"matrix": [2, 6], "x": 35, "y": 0},
+                {"matrix": [2, 7], "x": 36, "y": 0},
+                {"matrix": [2, 8], "x": 37, "y": 0},
+                {"matrix": [2, 9], "x": 38, "y": 0},
+                {"matrix": [2, 10], "x": 39, "y": 0},
+                {"matrix": [2, 11], "x": 40, "y": 0},
+                {"matrix": [2, 12], "x": 41, "y": 0},
+                {"matrix": [1, 13], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+
+                {"matrix": [3, 0], "x": 44, "y": 0},
+                {"matrix": [3, 1], "x": 45, "y": 0},
+                {"matrix": [3, 2], "x": 46, "y": 0},
+                {"matrix": [3, 3], "x": 47, "y": 0},
+                {"matrix": [3, 4], "x": 48, "y": 0},
+                {"matrix": [3, 5], "x": 49, "y": 0},
+                {"matrix": [3, 6], "x": 50, "y": 0},
+                {"matrix": [3, 7], "x": 51, "y": 0},
+                {"matrix": [3, 8], "x": 52, "y": 0},
+                {"matrix": [3, 9], "x": 53, "y": 0},
+                {"matrix": [3, 10], "x": 54, "y": 0},
+                {"matrix": [3, 11], "x": 55, "y": 0},
+                {"matrix": [3, 12], "x": 56, "y": 0},
+                {"matrix": [3, 13], "x": 57, "y": 0},
+                {"matrix": [3, 14], "x": 58, "y": 0},
+
+                {"matrix": [4, 0], "x": 59, "y": 0},
+                {"matrix": [4, 1], "x": 60, "y": 0},
+                {"matrix": [4, 2], "x": 61, "y": 0},
+                {"matrix": [4, 6], "x": 62, "y": 0},
+                {"matrix": [4, 9], "x": 63, "y": 0},
+                {"matrix": [4, 10], "x": 64, "y": 0},
+                {"matrix": [4, 11], "x": 65, "y": 0},
+                {"matrix": [4, 12], "x": 66, "y": 0},
+                {"matrix": [4, 13], "x": 67, "y": 0},
+                {"matrix": [4, 14], "x": 68, "y": 0}
+            ]
+        },
         "LAYOUT_encoder": {
             "layout": [
-                {"x": 1.25, "y": 0},
-                {"x": 2.25, "y": 0},
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0, "w": 2},
-                {"x": 16.25, "y": 0},
-
-                {"x": 1.25, "y": 1, "w": 1.5},
-                {"x": 2.75, "y": 1},
-                {"x": 3.75, "y": 1},
-                {"x": 4.75, "y": 1},
-                {"x": 5.75, "y": 1},
-                {"x": 6.75, "y": 1},
-                {"x": 7.75, "y": 1},
-                {"x": 8.75, "y": 1},
-                {"x": 9.75, "y": 1},
-                {"x": 10.75, "y": 1},
-                {"x": 11.75, "y": 1},
-                {"x": 12.75, "y": 1},
-                {"x": 13.75, "y": 1},
-                {"x": 16.25, "y": 1},
-
-                {"x": 1.25, "y": 2, "w": 1.75},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-                {"x": 13, "y": 2},
-                {"x": 14, "y": 2},
-                {"x": 15, "y": 1, "w": 1.25, "h": 2},
-                {"x": 16.25, "y": 2},
-
-                {"x": 0, "y": 3},
-
-                {"x": 1.25, "y": 3, "w": 1.25},
-                {"x": 2.5, "y": 3},
-                {"x": 3.5, "y": 3},
-                {"x": 4.5, "y": 3},
-                {"x": 5.5, "y": 3},
-                {"x": 6.5, "y": 3},
-                {"x": 7.5, "y": 3},
-                {"x": 8.5, "y": 3},
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3},
-                {"x": 13.5, "y": 3, "w": 1.75},
-                {"x": 15.25, "y": 3},
-                {"x": 16.25, "y": 3},
-
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 1.25},
-                {"x": 5, "y": 4, "w": 6.25},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4},
-                {"x": 13.25, "y": 4},
-                {"x": 14.25, "y": 4},
-                {"x": 15.25, "y": 4},
-                {"x": 16.25, "y": 4}
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2.75, "y": 1},
+                {"matrix": [1, 2], "x": 3.75, "y": 1},
+                {"matrix": [1, 3], "x": 4.75, "y": 1},
+                {"matrix": [1, 4], "x": 5.75, "y": 1},
+                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"matrix": [1, 6], "x": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2},
+                {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2},
+
+                {"matrix": [4, 4], "x": 0, "y": 3},
+                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+                {"matrix": [3, 7], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 15.25, "y": 3},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 11.25, "y": 4},
+                {"matrix": [4, 10], "x": 12.25, "y": 4},
+                {"matrix": [4, 11], "x": 13.25, "y": 4},
+                {"matrix": [4, 12], "x": 14.25, "y": 4},
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/tkw/stoutgat/v2/v2.h b/keyboards/tkw/stoutgat/v2/v2.h
deleted file mode 100644
index ff44742ff5..0000000000
--- a/keyboards/tkw/stoutgat/v2/v2.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Thys de Wet
- *
- * 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
-
-#define _x_ KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_encoder( \
-          K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-          K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-          K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-    K44,  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-          K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, K44, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-#define LAYOUT_65_iso( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D, K2E, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E } \
-}
-
-#define LAYOUT_65_ansi( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, K4A, K4B, K4C, K4D, K4E} \
-}
-
-#define LAYOUT_65_ansi_blocker( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-  K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-  K40, K41, K42,                K46,           K49,      K4B, K4C, K4D, K4E \
-) { \
-{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, _x_, K2E }, \
-{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, K49, _x_, K4B, K4C, K4D, K4E} \
-}