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

3 files changed, 267 insertions, 246 deletions

diff --git a/keyboards/cutie_club/wraith/info.json b/keyboards/cutie_club/wraith/info.json
index f18b39837e..9a0c030066 100644
--- a/keyboards/cutie_club/wraith/info.json
+++ b/keyboards/cutie_club/wraith/info.json
@@ -20,173 +20,278 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 15, "y": 0},
+                {"matrix": [3, 0], "x": 16, "y": 0},
+                {"matrix": [2, 1], "x": 17, "y": 0},
+                {"matrix": [3, 1], "x": 18, "y": 0},
+                {"matrix": [2, 2], "x": 19, "y": 0},
+                {"matrix": [3, 2], "x": 20, "y": 0},
+                {"matrix": [2, 3], "x": 21, "y": 0},
+                {"matrix": [3, 3], "x": 22, "y": 0},
+                {"matrix": [2, 4], "x": 23, "y": 0},
+                {"matrix": [3, 4], "x": 24, "y": 0},
+                {"matrix": [2, 5], "x": 25, "y": 0},
+                {"matrix": [3, 5], "x": 26, "y": 0},
+                {"matrix": [2, 6], "x": 27, "y": 0},
+                {"matrix": [3, 6], "x": 28, "y": 0},
+                {"matrix": [2, 7], "x": 29, "y": 0},
+                {"matrix": [4, 0], "x": 30, "y": 0},
+                {"matrix": [5, 0], "x": 31, "y": 0},
+                {"matrix": [4, 1], "x": 32, "y": 0},
+                {"matrix": [5, 1], "x": 33, "y": 0},
+                {"matrix": [4, 2], "x": 34, "y": 0},
+                {"matrix": [5, 2], "x": 35, "y": 0},
+                {"matrix": [4, 3], "x": 36, "y": 0},
+                {"matrix": [5, 3], "x": 37, "y": 0},
+                {"matrix": [4, 4], "x": 38, "y": 0},
+                {"matrix": [5, 4], "x": 39, "y": 0},
+                {"matrix": [4, 5], "x": 40, "y": 0},
+                {"matrix": [5, 5], "x": 41, "y": 0},
+                {"matrix": [4, 6], "x": 42, "y": 0},
+                {"matrix": [4, 7], "x": 43, "y": 0},
+                {"matrix": [6, 0], "x": 44, "y": 0},
+                {"matrix": [7, 0], "x": 45, "y": 0},
+                {"matrix": [6, 1], "x": 46, "y": 0},
+                {"matrix": [7, 1], "x": 47, "y": 0},
+                {"matrix": [6, 2], "x": 48, "y": 0},
+                {"matrix": [7, 2], "x": 49, "y": 0},
+                {"matrix": [6, 3], "x": 50, "y": 0},
+                {"matrix": [7, 3], "x": 51, "y": 0},
+                {"matrix": [6, 4], "x": 52, "y": 0},
+                {"matrix": [7, 4], "x": 53, "y": 0},
+                {"matrix": [6, 5], "x": 54, "y": 0},
+                {"matrix": [7, 5], "x": 55, "y": 0},
+                {"matrix": [6, 6], "x": 56, "y": 0},
+                {"matrix": [7, 6], "x": 57, "y": 0},
+                {"matrix": [6, 7], "x": 58, "y": 0},
+                {"matrix": [8, 0], "x": 59, "y": 0},
+                {"matrix": [9, 0], "x": 60, "y": 0},
+                {"matrix": [8, 1], "x": 61, "y": 0},
+                {"matrix": [9, 1], "x": 62, "y": 0},
+                {"matrix": [8, 2], "x": 63, "y": 0},
+                {"matrix": [9, 2], "x": 64, "y": 0},
+                {"matrix": [8, 3], "x": 65, "y": 0},
+                {"matrix": [9, 3], "x": 66, "y": 0},
+                {"matrix": [8, 4], "x": 67, "y": 0},
+                {"matrix": [9, 4], "x": 68, "y": 0},
+                {"matrix": [8, 5], "x": 69, "y": 0},
+                {"matrix": [9, 5], "x": 70, "y": 0},
+                {"matrix": [8, 6], "x": 71, "y": 0},
+                {"matrix": [9, 6], "x": 72, "y": 0},
+                {"matrix": [8, 7], "x": 73, "y": 0},
+                {"matrix": [10, 0], "x": 74, "y": 0},
+                {"matrix": [10, 1], "x": 75, "y": 0},
+                {"matrix": [10, 3], "x": 76, "y": 0},
+                {"matrix": [11, 5], "x": 77, "y": 0},
+                {"matrix": [10, 6], "x": 78, "y": 0},
+                {"matrix": [11, 6], "x": 79, "y": 0},
+                {"matrix": [10, 7], "x": 80, "y": 0}
+            ]
+        },
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Prt Sc", "x":14, "y":0},
-                {"label":"Fn", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"@", "x":2, "y":1},
-                {"label":"#", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Insert", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"Delete", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Pg Up", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"Pg Dn", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":2.25, "y":5, "w":1.5},
-                {"x":3.75, "y":5, "w":7},
-                {"label":"Alt", "x":10.75, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2},
+                {"matrix": [4, 1], "x": 2.5, "y": 2},
+                {"matrix": [5, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+                {"matrix": [4, 4], "x": 8.5, "y": 2},
+                {"matrix": [5, 4], "x": 9.5, "y": 2},
+                {"matrix": [4, 5], "x": 10.5, "y": 2},
+                {"matrix": [5, 5], "x": 11.5, "y": 2},
+                {"matrix": [4, 6], "x": 12.5, "y": 2},
+                {"matrix": [6, 6], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [6, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4},
+
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 7},
+                {"matrix": [11, 5], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"matrix": [10, 6], "x": 13, "y": 5},
+                {"matrix": [11, 6], "x": 14, "y": 5},
+                {"matrix": [10, 7], "x": 15, "y": 5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Prt Sc", "x":14, "y":0},
-                {"label":"Fn", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Insert", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Delete", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Pg Up", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"Pg Dn", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.5},
-                {"label":"Alt", "x":2.25, "y":5, "w":1.5},
-                {"x":3.75, "y":5, "w":7},
-                {"label":"Alt", "x":10.75, "y":5, "w":1.5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 0},
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 5.5, "y": 0},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+                {"matrix": [1, 4], "x": 9.75, "y": 0},
+                {"matrix": [0, 5], "x": 10.75, "y": 0},
+                {"matrix": [1, 5], "x": 11.75, "y": 0},
+                {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+                {"matrix": [1, 6], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 7], "x": 15, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2},
+                {"matrix": [4, 1], "x": 2.5, "y": 2},
+                {"matrix": [5, 1], "x": 3.5, "y": 2},
+                {"matrix": [4, 2], "x": 4.5, "y": 2},
+                {"matrix": [5, 2], "x": 5.5, "y": 2},
+                {"matrix": [4, 3], "x": 6.5, "y": 2},
+                {"matrix": [5, 3], "x": 7.5, "y": 2},
+                {"matrix": [4, 4], "x": 8.5, "y": 2},
+                {"matrix": [5, 4], "x": 9.5, "y": 2},
+                {"matrix": [4, 5], "x": 10.5, "y": 2},
+                {"matrix": [5, 5], "x": 11.5, "y": 2},
+                {"matrix": [4, 6], "x": 12.5, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 6], "x": 12.75, "y": 3},
+                {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [6, 7], "x": 15, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [8, 7], "x": 15, "y": 4},
+
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.25, "y": 5, "w": 1.5},
+                {"matrix": [10, 3], "x": 3.75, "y": 5, "w": 7},
+                {"matrix": [11, 5], "x": 10.75, "y": 5, "w": 1.5},
+
+                {"matrix": [10, 6], "x": 13, "y": 5},
+                {"matrix": [11, 6], "x": 14, "y": 5},
+                {"matrix": [10, 7], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/cutie_club/wraith/wraith.c b/keyboards/cutie_club/wraith/wraith.c
index cb2d1911c7..799ac318e6 100644
--- a/keyboards/cutie_club/wraith/wraith.c
+++ b/keyboards/cutie_club/wraith/wraith.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "wraith.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     setPinOutput(B0);
diff --git a/keyboards/cutie_club/wraith/wraith.h b/keyboards/cutie_club/wraith/wraith.h
deleted file mode 100644
index 156937a1f5..0000000000
--- a/keyboards/cutie_club/wraith/wraith.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright 2019 Amber Holly
- *
- * 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 LAYOUT_all( \
-     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
-     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,\
-     K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K47,\
-     K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,\
-     K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87,\
-     KA0,      KA1,                KA3,                     KB5, KA6, KB6, KA7\
- ) { \
-     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-     { K10, K11, K12, K13, K14, K15, K16 }, \
-     { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-     { K30, K31, K32, K33, K34, K35, K36 }, \
-     { K40, K41, K42, K43, K44, K45, K46, K47}, \
-     { K50, K51, K52, K53, K54, K55, KC_NO }, \
-     { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-     { K70, K71, K72, K73, K74, K75, K76 }, \
-     { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-     { K90, K91, K92, K93, K94, K95, K96 }, \
-     { KA0, KA1, KC_NO, KA3, KC_NO, KC_NO, KA6, KA7 }, \
-     { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6 } \
-}
-
- #define LAYOUT_iso( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,\
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,      K47,\
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,\
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87,\
-    KA0,      KA1,                KA3,                     KB5, KA6, KB6, KA7\
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47}, \
-    { K50, K51, K52, K53, K54, K55, KC_NO }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { K90, K91, K92, K93, K94, K95, K96 }, \
-    { KA0, KA1, KC_NO, KA3, KC_NO, KC_NO, KA6, KA7 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6 } \
-}
-
-#define LAYOUT_ansi( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,\
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K66, K47,\
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76,      K67,\
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87,\
-    KA0,      KA1,                KA3,                     KB5, KA6, KB6, KA7\
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47}, \
-    { K50, K51, K52, K53, K54, K55, KC_NO }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67 }, \
-    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { K80, K81, K82, K83, K84, K85, K86, K87 }, \
-    { KC_NO, K91, K92, K93, K94, K95, K96 }, \
-    { KA0, KA1, KC_NO, KA3, KC_NO, KC_NO, KA6, KA7 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6 } \
-}