Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 238 insertions, 119 deletions

diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json
index 6b4ea75bb0..02dc364a35 100644
--- a/keyboards/trashman/ketch/info.json
+++ b/keyboards/trashman/ketch/info.json
@@ -21,45 +21,260 @@
   "layouts": {
     "LAYOUT": {
       "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, "w":1.75},
-        {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "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":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 1], "x": 1, "y": 0},
+        {"matrix": [5, 2], "x": 2, "y": 0},
+        {"matrix": [5, 3], "x": 3, "y": 0},
+        {"matrix": [0, 0], "x": 4, "y": 0},
+        {"matrix": [0, 1], "x": 5, "y": 0},
+        {"matrix": [0, 2], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 1},
+        {"matrix": [4, 2], "x": 2.25, "y": 1},
+        {"matrix": [4, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 0], "x": 4.25, "y": 1},
+        {"matrix": [1, 1], "x": 5.25, "y": 1},
+        {"matrix": [1, 2], "x": 6.25, "y": 1},
+        {"matrix": [1, 3], "x": 7.25, "y": 1},
+        {"matrix": [1, 4], "x": 8.25, "y": 1},
+        {"matrix": [1, 5], "x": 9.25, "y": 1},
+        {"matrix": [1, 6], "x": 10.25, "y": 1},
+        {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+        {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [5, 6], "x": 1.75, "y": 2},
+        {"matrix": [5, 5], "x": 2.75, "y": 2},
+        {"matrix": [4, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 0], "x": 4.75, "y": 2},
+        {"matrix": [2, 1], "x": 5.75, "y": 2},
+        {"matrix": [2, 2], "x": 6.75, "y": 2},
+        {"matrix": [2, 3], "x": 7.75, "y": 2},
+        {"matrix": [2, 4], "x": 8.75, "y": 2},
+        {"matrix": [2, 5], "x": 9.75, "y": 2},
+        {"matrix": [2, 6], "x": 10.75, "y": 2},
+        {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+        {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
+        {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
+        {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
       ]
     },
-
     "LAYOUT_arrow": {
       "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, "w":1.75},
-       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "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":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 1], "x": 1, "y": 0},
+        {"matrix": [5, 2], "x": 2, "y": 0},
+        {"matrix": [5, 3], "x": 3, "y": 0},
+        {"matrix": [0, 0], "x": 4, "y": 0},
+        {"matrix": [0, 1], "x": 5, "y": 0},
+        {"matrix": [0, 2], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 1},
+        {"matrix": [4, 2], "x": 2.25, "y": 1},
+        {"matrix": [4, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 0], "x": 4.25, "y": 1},
+        {"matrix": [1, 1], "x": 5.25, "y": 1},
+        {"matrix": [1, 2], "x": 6.25, "y": 1},
+        {"matrix": [1, 3], "x": 7.25, "y": 1},
+        {"matrix": [1, 4], "x": 8.25, "y": 1},
+        {"matrix": [1, 5], "x": 9.25, "y": 1},
+        {"matrix": [1, 6], "x": 10.25, "y": 1},
+        {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+        {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [5, 6], "x": 1.75, "y": 2},
+        {"matrix": [5, 5], "x": 2.75, "y": 2},
+        {"matrix": [4, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 0], "x": 4.75, "y": 2},
+        {"matrix": [2, 1], "x": 5.75, "y": 2},
+        {"matrix": [2, 2], "x": 6.75, "y": 2},
+        {"matrix": [2, 3], "x": 7.75, "y": 2},
+        {"matrix": [2, 4], "x": 8.75, "y": 2},
+        {"matrix": [2, 5], "x": 9.75, "y": 2},
+        {"matrix": [2, 6], "x": 10.75, "y": 2},
+        {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+        {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5},
+        {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25},
+        {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3}
       ]
     },
-
     "LAYOUT_command": {
       "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, "w":1.75},
-       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 1], "x": 1, "y": 0},
+        {"matrix": [5, 2], "x": 2, "y": 0},
+        {"matrix": [5, 3], "x": 3, "y": 0},
+        {"matrix": [0, 0], "x": 4, "y": 0},
+        {"matrix": [0, 1], "x": 5, "y": 0},
+        {"matrix": [0, 2], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 1},
+        {"matrix": [4, 2], "x": 2.25, "y": 1},
+        {"matrix": [4, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 0], "x": 4.25, "y": 1},
+        {"matrix": [1, 1], "x": 5.25, "y": 1},
+        {"matrix": [1, 2], "x": 6.25, "y": 1},
+        {"matrix": [1, 3], "x": 7.25, "y": 1},
+        {"matrix": [1, 4], "x": 8.25, "y": 1},
+        {"matrix": [1, 5], "x": 9.25, "y": 1},
+        {"matrix": [1, 6], "x": 10.25, "y": 1},
+        {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+        {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [5, 6], "x": 1.75, "y": 2},
+        {"matrix": [5, 5], "x": 2.75, "y": 2},
+        {"matrix": [4, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 0], "x": 4.75, "y": 2},
+        {"matrix": [2, 1], "x": 5.75, "y": 2},
+        {"matrix": [2, 2], "x": 6.75, "y": 2},
+        {"matrix": [2, 3], "x": 7.75, "y": 2},
+        {"matrix": [2, 4], "x": 8.75, "y": 2},
+        {"matrix": [2, 5], "x": 9.75, "y": 2},
+        {"matrix": [2, 6], "x": 10.75, "y": 2},
+        {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+        {"matrix": [4, 5], "x": 0, "y": 3},
+        {"matrix": [5, 4], "x": 1, "y": 3},
+        {"matrix": [3, 0], "x": 2, "y": 3},
+        {"matrix": [3, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5},
+        {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75}
       ]
     },
-
     "LAYOUT_all": {
       "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, "w":1.75},
-       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "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":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 1], "x": 1, "y": 0},
+        {"matrix": [5, 2], "x": 2, "y": 0},
+        {"matrix": [5, 3], "x": 3, "y": 0},
+        {"matrix": [0, 0], "x": 4, "y": 0},
+        {"matrix": [0, 1], "x": 5, "y": 0},
+        {"matrix": [0, 2], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 1},
+        {"matrix": [4, 2], "x": 2.25, "y": 1},
+        {"matrix": [4, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 0], "x": 4.25, "y": 1},
+        {"matrix": [1, 1], "x": 5.25, "y": 1},
+        {"matrix": [1, 2], "x": 6.25, "y": 1},
+        {"matrix": [1, 3], "x": 7.25, "y": 1},
+        {"matrix": [1, 4], "x": 8.25, "y": 1},
+        {"matrix": [1, 5], "x": 9.25, "y": 1},
+        {"matrix": [1, 6], "x": 10.25, "y": 1},
+        {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+        {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [5, 6], "x": 1.75, "y": 2},
+        {"matrix": [5, 5], "x": 2.75, "y": 2},
+        {"matrix": [4, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 0], "x": 4.75, "y": 2},
+        {"matrix": [2, 1], "x": 5.75, "y": 2},
+        {"matrix": [2, 2], "x": 6.75, "y": 2},
+        {"matrix": [2, 3], "x": 7.75, "y": 2},
+        {"matrix": [2, 4], "x": 8.75, "y": 2},
+        {"matrix": [2, 5], "x": 9.75, "y": 2},
+        {"matrix": [2, 6], "x": 10.75, "y": 2},
+        {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+        {"matrix": [4, 5], "x": 0, "y": 3},
+        {"matrix": [5, 4], "x": 1, "y": 3},
+        {"matrix": [3, 0], "x": 2, "y": 3},
+        {"matrix": [3, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25},
+        {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2},
+        {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3}
       ]
     },
     "LAYOUT_jetvan": {
       "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, "w":1.75},
-       	{"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "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":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+        {"matrix": [5, 1], "x": 1, "y": 0},
+        {"matrix": [5, 2], "x": 2, "y": 0},
+        {"matrix": [5, 3], "x": 3, "y": 0},
+        {"matrix": [0, 0], "x": 4, "y": 0},
+        {"matrix": [0, 1], "x": 5, "y": 0},
+        {"matrix": [0, 2], "x": 6, "y": 0},
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [0, 4], "x": 8, "y": 0},
+        {"matrix": [0, 5], "x": 9, "y": 0},
+        {"matrix": [0, 6], "x": 10, "y": 0},
+        {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 1},
+        {"matrix": [4, 2], "x": 2.25, "y": 1},
+        {"matrix": [4, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 0], "x": 4.25, "y": 1},
+        {"matrix": [1, 1], "x": 5.25, "y": 1},
+        {"matrix": [1, 2], "x": 6.25, "y": 1},
+        {"matrix": [1, 3], "x": 7.25, "y": 1},
+        {"matrix": [1, 4], "x": 8.25, "y": 1},
+        {"matrix": [1, 5], "x": 9.25, "y": 1},
+        {"matrix": [1, 6], "x": 10.25, "y": 1},
+        {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5},
+
+        {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [5, 6], "x": 1.75, "y": 2},
+        {"matrix": [5, 5], "x": 2.75, "y": 2},
+        {"matrix": [4, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 0], "x": 4.75, "y": 2},
+        {"matrix": [2, 1], "x": 5.75, "y": 2},
+        {"matrix": [2, 2], "x": 6.75, "y": 2},
+        {"matrix": [2, 3], "x": 7.75, "y": 2},
+        {"matrix": [2, 4], "x": 8.75, "y": 2},
+        {"matrix": [2, 5], "x": 9.75, "y": 2},
+        {"matrix": [2, 6], "x": 10.75, "y": 2},
+        {"matrix": [2, 7], "x": 11.75, "y": 2},
+
+        {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [5, 4], "x": 1.25, "y": 3},
+        {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25},
+        {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 6.25},
+        {"matrix": [3, 5], "x": 9.75, "y": 3},
+        {"matrix": [3, 6], "x": 10.75, "y": 3},
+        {"matrix": [3, 7], "x": 11.75, "y": 3}
       ]
     }
   }
diff --git a/keyboards/trashman/ketch/ketch.h b/keyboards/trashman/ketch/ketch.h
deleted file mode 100644
index 25be7cf8f9..0000000000
--- a/keyboards/trashman/ketch/ketch.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT(\
-    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
-    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
-    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
-    K37,  K43,   K24,      K26,      K27,  K28,  K29,    K31\
-) {\
-    { K0, K1, K2, K3, K4, K5, K6, K7 },\
-    { K8, K9, K10, K11, K12, K13, K14, K15 },\
-    { K16, K17, K18, K19, K20, K21, K22, K23 },\
-    { KC_NO, K24, K26, K27, K28, K29, KC_NO, K31 },\
-    { K32, K33, K34, K35, K36, K37, K38, KC_NO },\
-    { K39, K40, K41, K42, K43, K44, K45, KC_NO }\
-}
-
-#define LAYOUT_arrow(\
-    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
-    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
-    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
-    K37,  K43,   K24,      K26,      K27,  K28,  K29, K30, K31\
-) {\
-    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
-    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
-    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
-    { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \
-    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
-    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-#define LAYOUT_command(\
-    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
-    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
-    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
-    K37, K43, K24, K25,    K26,      K27,  K28,  K29,    K31\
-) {\
-    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
-    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
-    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
-    { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \
-    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
-    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but
-// using "all" here to match typical qmk conventions
-#define LAYOUT_all(\
-    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
-    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
-    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
-    K37, K43, K24, K25,    K26,      K27,  K28,  K29, K30, K31\
-) {\
-    { K0, K1, K2, K3, K4, K5, K6, K7 }, \
-    { K8, K9, K10, K11, K12, K13, K14, K15 }, \
-    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
-    { K24, K25, K26, K27, K28, K29, K30, K31 }, \
-    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
-    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}
-
-#define LAYOUT_jetvan(\
-    K39, K40, K41, K42, K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7,\
-    K32, K33, K34, K35, K8,  K9,  K10, K11, K12, K13, K14, K15,\
-    K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\
-    K37,  K43, K24,               K27,           K29, K30, K31\
-) {\
-    { K0,  K1,  K2,  K3,  K4,  K5,  K6,  K7 }, \
-    { K8,  K9,  K10, K11, K12, K13, K14, K15 }, \
-    { K16, K17, K18, K19, K20, K21, K22, K23 }, \
-    { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \
-    { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \
-    { K39, K40, K41, K42, K43, K44, K45, KC_NO } \
-}