Move TKL layouts to data driven (#20337)

2 files changed, 204 insertions, 264 deletions

diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index b6ec7756b0..4f2e248aa5 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/keyboards/evyd13/quackfire/info.json
@@ -24,208 +24,217 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_iso"
+    },
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-                {"label":"|", "x":13.5, "y":2.5, "w":1.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 13], "x": 2, "y": 0},
+                {"matrix": [0, 11], "x": 3, "y": 0},
+                {"matrix": [4, 11], "x": 4, "y": 0},
+                {"matrix": [3, 11], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 6], "x": 7.5, "y": 0},
+                {"matrix": [4, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 11, "y": 0},
+                {"matrix": [2, 3], "x": 12, "y": 0},
+                {"matrix": [3, 3], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 0, "y": 1.5},
+                {"matrix": [2, 14], "x": 1, "y": 1.5},
+                {"matrix": [2, 13], "x": 2, "y": 1.5},
+                {"matrix": [2, 11], "x": 3, "y": 1.5},
+                {"matrix": [2, 9], "x": 4, "y": 1.5},
+                {"matrix": [0, 9], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 7], "x": 7, "y": 1.5},
+                {"matrix": [2, 6], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 4], "x": 10, "y": 1.5},
+                {"matrix": [0, 4], "x": 11, "y": 1.5},
+                {"matrix": [0, 6], "x": 12, "y": 1.5},
+                {"matrix": [4, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 14], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [0, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 13], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 14], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 13], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 3.75, "y": 3.5},
+                {"matrix": [7, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 12], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 14], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [3, 10], "x": 16.25, "y": 4.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 10], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 0], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [6, 10], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 0], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
-
-                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.5},
-                {"label":"W", "x":2.5, "y":2.5},
-                {"label":"E", "x":3.5, "y":2.5},
-                {"label":"R", "x":4.5, "y":2.5},
-                {"label":"T", "x":5.5, "y":2.5},
-                {"label":"Y", "x":6.5, "y":2.5},
-                {"label":"U", "x":7.5, "y":2.5},
-                {"label":"I", "x":8.5, "y":2.5},
-                {"label":"O", "x":9.5, "y":2.5},
-                {"label":"P", "x":10.5, "y":2.5},
-                {"label":"{", "x":11.5, "y":2.5},
-                {"label":"}", "x":12.5, "y":2.5},
-
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
-
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
-
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 14], "x": 0, "y": 0},
+
+                {"matrix": [0, 13], "x": 2, "y": 0},
+                {"matrix": [0, 11], "x": 3, "y": 0},
+                {"matrix": [4, 11], "x": 4, "y": 0},
+                {"matrix": [3, 11], "x": 5, "y": 0},
+
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 6], "x": 7.5, "y": 0},
+                {"matrix": [4, 5], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 11, "y": 0},
+                {"matrix": [2, 3], "x": 12, "y": 0},
+                {"matrix": [3, 3], "x": 13, "y": 0},
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [2, 8], "x": 15.25, "y": 0},
+                {"matrix": [1, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 14], "x": 0, "y": 1.5},
+                {"matrix": [2, 14], "x": 1, "y": 1.5},
+                {"matrix": [2, 13], "x": 2, "y": 1.5},
+                {"matrix": [2, 11], "x": 3, "y": 1.5},
+                {"matrix": [2, 9], "x": 4, "y": 1.5},
+                {"matrix": [0, 9], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [2, 7], "x": 7, "y": 1.5},
+                {"matrix": [2, 6], "x": 8, "y": 1.5},
+                {"matrix": [2, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 4], "x": 10, "y": 1.5},
+                {"matrix": [0, 4], "x": 11, "y": 1.5},
+                {"matrix": [0, 6], "x": 12, "y": 1.5},
+                {"matrix": [4, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 2], "x": 15.25, "y": 1.5},
+                {"matrix": [0, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [0, 12], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 14], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 14], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 9], "x": 4.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 4], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [0, 0], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 13], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 14], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 13], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 3.75, "y": 3.5},
+                {"matrix": [7, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 12], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [3, 13], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 14], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 3.25, "y": 4.5},
+                {"matrix": [5, 11], "x": 4.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [3, 10], "x": 16.25, "y": 4.5},
+
+                {"matrix": [0, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 10], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 8], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 0], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [6, 10], "x": 15.25, "y": 5.5},
+                {"matrix": [6, 0], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/quackfire/quackfire.h b/keyboards/evyd13/quackfire/quackfire.h
deleted file mode 100644
index 8746f356fd..0000000000
--- a/keyboards/evyd13/quackfire/quackfire.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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
-
-/* 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_all LAYOUT_tkl_iso
-
-#define LAYOUT_tkl_ansi( \
-    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
-    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
-    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46, k73,      k00, k2a, k2c, \
-    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34,      k53,                     \
-    k4c,      k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
-    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
-    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, XXX, k3e }, \
-    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
-    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
-    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
-    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
-    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46,           k00, k2a, k2c, \
-    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34, k73, k53,                     \
-    k4c, k3d, k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
-    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
-    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
-    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
-    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
-    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
-    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
-    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
-    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
-}