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

2 files changed, 339 insertions, 115 deletions

diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index e280220217..e0255bb7da 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -24,23 +24,353 @@
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_all": {
-          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+          "layout": [
+            {"matrix": [3, 6], "x": 0, "y": 0},
+            {"matrix": [3, 7], "x": 1, "y": 0},
+            {"matrix": [4, 6], "x": 2, "y": 0},
+            {"matrix": [4, 7], "x": 3, "y": 0},
+            {"matrix": [5, 6], "x": 4, "y": 0},
+            {"matrix": [5, 7], "x": 5, "y": 0},
+            {"matrix": [6, 6], "x": 6, "y": 0},
+            {"matrix": [6, 7], "x": 7, "y": 0},
+            {"matrix": [7, 6], "x": 8, "y": 0},
+            {"matrix": [7, 7], "x": 9, "y": 0},
+            {"matrix": [0, 6], "x": 10, "y": 0},
+            {"matrix": [0, 7], "x": 11, "y": 0},
+            {"matrix": [1, 7], "x": 12, "y": 0},
+            {"matrix": [2, 6], "x": 13, "y": 0},
+            {"matrix": [2, 7], "x": 14, "y": 0},
+
+            {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [3, 5], "x": 1.5, "y": 1},
+            {"matrix": [4, 4], "x": 2.5, "y": 1},
+            {"matrix": [4, 5], "x": 3.5, "y": 1},
+            {"matrix": [5, 4], "x": 4.5, "y": 1},
+            {"matrix": [5, 5], "x": 5.5, "y": 1},
+            {"matrix": [6, 4], "x": 6.5, "y": 1},
+            {"matrix": [6, 5], "x": 7.5, "y": 1},
+            {"matrix": [7, 5], "x": 8.5, "y": 1},
+            {"matrix": [0, 5], "x": 9.5, "y": 1},
+            {"matrix": [1, 5], "x": 10.5, "y": 1},
+            {"matrix": [1, 6], "x": 11.5, "y": 1},
+            {"matrix": [2, 5], "x": 12.5, "y": 1},
+            {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 3], "x": 1.75, "y": 2},
+            {"matrix": [4, 3], "x": 2.75, "y": 2},
+            {"matrix": [5, 2], "x": 3.75, "y": 2},
+            {"matrix": [5, 3], "x": 4.75, "y": 2},
+            {"matrix": [6, 3], "x": 5.75, "y": 2},
+            {"matrix": [7, 3], "x": 6.75, "y": 2},
+            {"matrix": [7, 4], "x": 7.75, "y": 2},
+            {"matrix": [0, 3], "x": 8.75, "y": 2},
+            {"matrix": [0, 4], "x": 9.75, "y": 2},
+            {"matrix": [1, 3], "x": 10.75, "y": 2},
+            {"matrix": [1, 4], "x": 11.75, "y": 2},
+            {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+            {"matrix": [4, 1], "x": 1.25, "y": 3},
+            {"matrix": [4, 2], "x": 2.25, "y": 3},
+            {"matrix": [5, 1], "x": 3.25, "y": 3},
+            {"matrix": [6, 1], "x": 4.25, "y": 3},
+            {"matrix": [6, 2], "x": 5.25, "y": 3},
+            {"matrix": [7, 1], "x": 6.25, "y": 3},
+            {"matrix": [7, 2], "x": 7.25, "y": 3},
+            {"matrix": [0, 1], "x": 8.25, "y": 3},
+            {"matrix": [0, 2], "x": 9.25, "y": 3},
+            {"matrix": [1, 1], "x": 10.25, "y": 3},
+            {"matrix": [1, 2], "x": 11.25, "y": 3},
+            {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 1.75},
+            {"matrix": [2, 2], "x": 14, "y": 3},
+
+            {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [6, 0], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.25},
+            {"matrix": [0, 0], "x": 11.25, "y": 4, "w": 1.25},
+            {"matrix": [1, 0], "x": 12.5, "y": 4, "w": 1.25},
+            {"matrix": [2, 0], "x": 13.75, "y": 4, "w": 1.25}
+          ]
         },
-  
         "LAYOUT_60_ansi": {
-            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+          "layout": [
+            {"matrix": [3, 6], "x": 0, "y": 0},
+            {"matrix": [3, 7], "x": 1, "y": 0},
+            {"matrix": [4, 6], "x": 2, "y": 0},
+            {"matrix": [4, 7], "x": 3, "y": 0},
+            {"matrix": [5, 6], "x": 4, "y": 0},
+            {"matrix": [5, 7], "x": 5, "y": 0},
+            {"matrix": [6, 6], "x": 6, "y": 0},
+            {"matrix": [6, 7], "x": 7, "y": 0},
+            {"matrix": [7, 6], "x": 8, "y": 0},
+            {"matrix": [7, 7], "x": 9, "y": 0},
+            {"matrix": [0, 6], "x": 10, "y": 0},
+            {"matrix": [0, 7], "x": 11, "y": 0},
+            {"matrix": [1, 7], "x": 12, "y": 0},
+            {"matrix": [2, 7], "x": 13, "y": 0, "w": 2},
+
+            {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [3, 5], "x": 1.5, "y": 1},
+            {"matrix": [4, 4], "x": 2.5, "y": 1},
+            {"matrix": [4, 5], "x": 3.5, "y": 1},
+            {"matrix": [5, 4], "x": 4.5, "y": 1},
+            {"matrix": [5, 5], "x": 5.5, "y": 1},
+            {"matrix": [6, 4], "x": 6.5, "y": 1},
+            {"matrix": [6, 5], "x": 7.5, "y": 1},
+            {"matrix": [7, 5], "x": 8.5, "y": 1},
+            {"matrix": [0, 5], "x": 9.5, "y": 1},
+            {"matrix": [1, 5], "x": 10.5, "y": 1},
+            {"matrix": [1, 6], "x": 11.5, "y": 1},
+            {"matrix": [2, 5], "x": 12.5, "y": 1},
+            {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 3], "x": 1.75, "y": 2},
+            {"matrix": [4, 3], "x": 2.75, "y": 2},
+            {"matrix": [5, 2], "x": 3.75, "y": 2},
+            {"matrix": [5, 3], "x": 4.75, "y": 2},
+            {"matrix": [6, 3], "x": 5.75, "y": 2},
+            {"matrix": [7, 3], "x": 6.75, "y": 2},
+            {"matrix": [7, 4], "x": 7.75, "y": 2},
+            {"matrix": [0, 3], "x": 8.75, "y": 2},
+            {"matrix": [0, 4], "x": 9.75, "y": 2},
+            {"matrix": [1, 3], "x": 10.75, "y": 2},
+            {"matrix": [1, 4], "x": 11.75, "y": 2},
+            {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [4, 2], "x": 2.25, "y": 3},
+            {"matrix": [5, 1], "x": 3.25, "y": 3},
+            {"matrix": [6, 1], "x": 4.25, "y": 3},
+            {"matrix": [6, 2], "x": 5.25, "y": 3},
+            {"matrix": [7, 1], "x": 6.25, "y": 3},
+            {"matrix": [7, 2], "x": 7.25, "y": 3},
+            {"matrix": [0, 1], "x": 8.25, "y": 3},
+            {"matrix": [0, 2], "x": 9.25, "y": 3},
+            {"matrix": [1, 1], "x": 10.25, "y": 3},
+            {"matrix": [1, 2], "x": 11.25, "y": 3},
+            {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75},
+
+            {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [6, 0], "x": 3.75, "y": 4, "w": 6.25},
+            {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.25},
+            {"matrix": [0, 0], "x": 11.25, "y": 4, "w": 1.25},
+            {"matrix": [1, 0], "x": 12.5, "y": 4, "w": 1.25},
+            {"matrix": [2, 0], "x": 13.75, "y": 4, "w": 1.25}
+          ]
         },
-  
         "LAYOUT_infinity": {
-          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+          "layout": [
+            {"matrix": [3, 6], "x": 0, "y": 0},
+            {"matrix": [3, 7], "x": 1, "y": 0},
+            {"matrix": [4, 6], "x": 2, "y": 0},
+            {"matrix": [4, 7], "x": 3, "y": 0},
+            {"matrix": [5, 6], "x": 4, "y": 0},
+            {"matrix": [5, 7], "x": 5, "y": 0},
+            {"matrix": [6, 6], "x": 6, "y": 0},
+            {"matrix": [6, 7], "x": 7, "y": 0},
+            {"matrix": [7, 6], "x": 8, "y": 0},
+            {"matrix": [7, 7], "x": 9, "y": 0},
+            {"matrix": [0, 6], "x": 10, "y": 0},
+            {"matrix": [0, 7], "x": 11, "y": 0},
+            {"matrix": [1, 7], "x": 12, "y": 0},
+            {"matrix": [2, 6], "x": 13, "y": 0},
+            {"matrix": [2, 7], "x": 14, "y": 0},
+
+            {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [3, 5], "x": 1.5, "y": 1},
+            {"matrix": [4, 4], "x": 2.5, "y": 1},
+            {"matrix": [4, 5], "x": 3.5, "y": 1},
+            {"matrix": [5, 4], "x": 4.5, "y": 1},
+            {"matrix": [5, 5], "x": 5.5, "y": 1},
+            {"matrix": [6, 4], "x": 6.5, "y": 1},
+            {"matrix": [6, 5], "x": 7.5, "y": 1},
+            {"matrix": [7, 5], "x": 8.5, "y": 1},
+            {"matrix": [0, 5], "x": 9.5, "y": 1},
+            {"matrix": [1, 5], "x": 10.5, "y": 1},
+            {"matrix": [1, 6], "x": 11.5, "y": 1},
+            {"matrix": [2, 5], "x": 12.5, "y": 1},
+            {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 3], "x": 1.75, "y": 2},
+            {"matrix": [4, 3], "x": 2.75, "y": 2},
+            {"matrix": [5, 2], "x": 3.75, "y": 2},
+            {"matrix": [5, 3], "x": 4.75, "y": 2},
+            {"matrix": [6, 3], "x": 5.75, "y": 2},
+            {"matrix": [7, 3], "x": 6.75, "y": 2},
+            {"matrix": [7, 4], "x": 7.75, "y": 2},
+            {"matrix": [0, 3], "x": 8.75, "y": 2},
+            {"matrix": [0, 4], "x": 9.75, "y": 2},
+            {"matrix": [1, 3], "x": 10.75, "y": 2},
+            {"matrix": [1, 4], "x": 11.75, "y": 2},
+            {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [4, 2], "x": 2.25, "y": 3},
+            {"matrix": [5, 1], "x": 3.25, "y": 3},
+            {"matrix": [6, 1], "x": 4.25, "y": 3},
+            {"matrix": [6, 2], "x": 5.25, "y": 3},
+            {"matrix": [7, 1], "x": 6.25, "y": 3},
+            {"matrix": [7, 2], "x": 7.25, "y": 3},
+            {"matrix": [0, 1], "x": 8.25, "y": 3},
+            {"matrix": [0, 2], "x": 9.25, "y": 3},
+            {"matrix": [1, 1], "x": 10.25, "y": 3},
+            {"matrix": [1, 2], "x": 11.25, "y": 3},
+            {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 1.75},
+            {"matrix": [2, 2], "x": 14, "y": 3},
+
+            {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+            {"matrix": [4, 0], "x": 1.5, "y": 4},
+            {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5},
+            {"matrix": [6, 0], "x": 4, "y": 4, "w": 6},
+            {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.5},
+            {"matrix": [0, 0], "x": 11.5, "y": 4},
+            {"matrix": [1, 0], "x": 12.5, "y": 4},
+            {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5}
+          ]
         },
-  
         "LAYOUT_aek_103": {
-          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":6.5}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+          "layout": [
+            {"matrix": [3, 6], "x": 0, "y": 0},
+            {"matrix": [3, 7], "x": 1, "y": 0},
+            {"matrix": [4, 6], "x": 2, "y": 0},
+            {"matrix": [4, 7], "x": 3, "y": 0},
+            {"matrix": [5, 6], "x": 4, "y": 0},
+            {"matrix": [5, 7], "x": 5, "y": 0},
+            {"matrix": [6, 6], "x": 6, "y": 0},
+            {"matrix": [6, 7], "x": 7, "y": 0},
+            {"matrix": [7, 6], "x": 8, "y": 0},
+            {"matrix": [7, 7], "x": 9, "y": 0},
+            {"matrix": [0, 6], "x": 10, "y": 0},
+            {"matrix": [0, 7], "x": 11, "y": 0},
+            {"matrix": [1, 7], "x": 12, "y": 0},
+            {"matrix": [2, 7], "x": 13, "y": 0, "w": 2},
+
+            {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [3, 5], "x": 1.5, "y": 1},
+            {"matrix": [4, 4], "x": 2.5, "y": 1},
+            {"matrix": [4, 5], "x": 3.5, "y": 1},
+            {"matrix": [5, 4], "x": 4.5, "y": 1},
+            {"matrix": [5, 5], "x": 5.5, "y": 1},
+            {"matrix": [6, 4], "x": 6.5, "y": 1},
+            {"matrix": [6, 5], "x": 7.5, "y": 1},
+            {"matrix": [7, 5], "x": 8.5, "y": 1},
+            {"matrix": [0, 5], "x": 9.5, "y": 1},
+            {"matrix": [1, 5], "x": 10.5, "y": 1},
+            {"matrix": [1, 6], "x": 11.5, "y": 1},
+            {"matrix": [2, 5], "x": 12.5, "y": 1},
+            {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5},
+
+            {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 3], "x": 1.75, "y": 2},
+            {"matrix": [4, 3], "x": 2.75, "y": 2},
+            {"matrix": [5, 2], "x": 3.75, "y": 2},
+            {"matrix": [5, 3], "x": 4.75, "y": 2},
+            {"matrix": [6, 3], "x": 5.75, "y": 2},
+            {"matrix": [7, 3], "x": 6.75, "y": 2},
+            {"matrix": [7, 4], "x": 7.75, "y": 2},
+            {"matrix": [0, 3], "x": 8.75, "y": 2},
+            {"matrix": [0, 4], "x": 9.75, "y": 2},
+            {"matrix": [1, 3], "x": 10.75, "y": 2},
+            {"matrix": [1, 4], "x": 11.75, "y": 2},
+            {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+            {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+            {"matrix": [4, 2], "x": 2.25, "y": 3},
+            {"matrix": [5, 1], "x": 3.25, "y": 3},
+            {"matrix": [6, 1], "x": 4.25, "y": 3},
+            {"matrix": [6, 2], "x": 5.25, "y": 3},
+            {"matrix": [7, 1], "x": 6.25, "y": 3},
+            {"matrix": [7, 2], "x": 7.25, "y": 3},
+            {"matrix": [0, 1], "x": 8.25, "y": 3},
+            {"matrix": [0, 2], "x": 9.25, "y": 3},
+            {"matrix": [1, 1], "x": 10.25, "y": 3},
+            {"matrix": [1, 2], "x": 11.25, "y": 3},
+            {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75},
+
+            {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+            {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+            {"matrix": [5, 0], "x": 2.75, "y": 4, "w": 1.5},
+            {"matrix": [6, 0], "x": 4.25, "y": 4, "w": 6.5},
+            {"matrix": [7, 0], "x": 10.75, "y": 4, "w": 1.5},
+            {"matrix": [0, 0], "x": 12.25, "y": 4, "w": 1.25},
+            {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5}
+          ]
         },
-  
         "LAYOUT_iso": {
-          "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"AltGr", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+          "layout": [
+            {"matrix": [3, 6], "x": 0, "y": 0},
+            {"matrix": [3, 7], "x": 1, "y": 0},
+            {"matrix": [4, 6], "x": 2, "y": 0},
+            {"matrix": [4, 7], "x": 3, "y": 0},
+            {"matrix": [5, 6], "x": 4, "y": 0},
+            {"matrix": [5, 7], "x": 5, "y": 0},
+            {"matrix": [6, 6], "x": 6, "y": 0},
+            {"matrix": [6, 7], "x": 7, "y": 0},
+            {"matrix": [7, 6], "x": 8, "y": 0},
+            {"matrix": [7, 7], "x": 9, "y": 0},
+            {"matrix": [0, 6], "x": 10, "y": 0},
+            {"matrix": [0, 7], "x": 11, "y": 0},
+            {"matrix": [1, 7], "x": 12, "y": 0},
+            {"matrix": [2, 7], "x": 13, "y": 0, "w": 2},
+
+            {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [3, 5], "x": 1.5, "y": 1},
+            {"matrix": [4, 4], "x": 2.5, "y": 1},
+            {"matrix": [4, 5], "x": 3.5, "y": 1},
+            {"matrix": [5, 4], "x": 4.5, "y": 1},
+            {"matrix": [5, 5], "x": 5.5, "y": 1},
+            {"matrix": [6, 4], "x": 6.5, "y": 1},
+            {"matrix": [6, 5], "x": 7.5, "y": 1},
+            {"matrix": [7, 5], "x": 8.5, "y": 1},
+            {"matrix": [0, 5], "x": 9.5, "y": 1},
+            {"matrix": [1, 5], "x": 10.5, "y": 1},
+            {"matrix": [1, 6], "x": 11.5, "y": 1},
+            {"matrix": [2, 5], "x": 12.5, "y": 1},
+            {"matrix": [2, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+            {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [3, 3], "x": 1.75, "y": 2},
+            {"matrix": [4, 3], "x": 2.75, "y": 2},
+            {"matrix": [5, 2], "x": 3.75, "y": 2},
+            {"matrix": [5, 3], "x": 4.75, "y": 2},
+            {"matrix": [6, 3], "x": 5.75, "y": 2},
+            {"matrix": [7, 3], "x": 6.75, "y": 2},
+            {"matrix": [7, 4], "x": 7.75, "y": 2},
+            {"matrix": [0, 3], "x": 8.75, "y": 2},
+            {"matrix": [0, 4], "x": 9.75, "y": 2},
+            {"matrix": [1, 3], "x": 10.75, "y": 2},
+            {"matrix": [1, 4], "x": 11.75, "y": 2},
+            {"matrix": [2, 3], "x": 12.75, "y": 2},
+
+            {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+            {"matrix": [4, 1], "x": 1.25, "y": 3},
+            {"matrix": [4, 2], "x": 2.25, "y": 3},
+            {"matrix": [5, 1], "x": 3.25, "y": 3},
+            {"matrix": [6, 1], "x": 4.25, "y": 3},
+            {"matrix": [6, 2], "x": 5.25, "y": 3},
+            {"matrix": [7, 1], "x": 6.25, "y": 3},
+            {"matrix": [7, 2], "x": 7.25, "y": 3},
+            {"matrix": [0, 1], "x": 8.25, "y": 3},
+            {"matrix": [0, 2], "x": 9.25, "y": 3},
+            {"matrix": [1, 1], "x": 10.25, "y": 3},
+            {"matrix": [1, 2], "x": 11.25, "y": 3},
+            {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75},
+
+            {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5},
+            {"matrix": [4, 0], "x": 1.5, "y": 4},
+            {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5},
+            {"matrix": [6, 0], "x": 4, "y": 4, "w": 7},
+            {"matrix": [7, 0], "x": 11, "y": 4, "w": 1.5},
+            {"matrix": [0, 0], "x": 12.5, "y": 4},
+            {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5}
+          ]
         }
     }
   }
diff --git a/keyboards/kapcave/paladin64/paladin64.h b/keyboards/kapcave/paladin64/paladin64.h
deleted file mode 100755
index b578c18540..0000000000
--- a/keyboards/kapcave/paladin64/paladin64.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-Copyright 2021 KapCave
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \
-    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
-    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
-    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \
-    k30, k40, k50,           k60,                     k70, k00, k10, k20 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
-
-#define LAYOUT_iso( \
-    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \
-    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
-    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
-    k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \
-    k30, k40, k50,           k60,                     k70, k00,      k20 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
-
-#define LAYOUT_60_ansi( \
-    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,      k27, \
-    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
-    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
-    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \
-    k30, k40, k50,           k60,                     k70, k00, k10, k20 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
-
-#define LAYOUT_infinity( \
-    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \
-    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
-    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
-    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \
-    k30, k40, k50,           k60,                     k70, k00, k10, k20 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
-
-#define LAYOUT_aek_103( \
-    k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17,     k27, \
-    k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \
-    k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \
-    k31,      k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \
-    k30, k40, k50,           k60,                     k70, k00,      k20 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}