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

3 files changed, 198 insertions, 232 deletions

diff --git a/keyboards/whale/sk/v3/info.json b/keyboards/whale/sk/v3/info.json
index 78967cd6e9..b3e6970a3c 100644
--- a/keyboards/whale/sk/v3/info.json
+++ b/keyboards/whale/sk/v3/info.json
@@ -19,182 +19,211 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0.25, "y":0},
-                {"label":"~", "x":1.25, "y":0},
-                {"label":"1", "x":2.25, "y":0},
-                {"label":"2", "x":3.25, "y":0},
-                {"label":"3", "x":4.25, "y":0},
-                {"label":"4", "x":5.25, "y":0},
-                {"label":"5", "x":6.25, "y":0},
-                {"label":"Home", "x":7.25, "y":0, "w":1.25},
-                {"label":"End", "x":11.5, "y":0, "w":1.25},
-                {"label":"6", "x":12.75, "y":0},
-                {"label":"7", "x":13.75, "y":0},
-                {"label":"8", "x":14.75, "y":0},
-                {"label":"9", "x":15.75, "y":0},
-                {"label":"0", "x":16.75, "y":0},
-                {"label":"-", "x":17.75, "y":0},
-                {"label":"=", "x":18.75, "y":0},
-                {"label":"Tab", "x":0.5, "y":1, "w":1.5},
-                {"label":"Q", "x":2, "y":1},
-                {"label":"W", "x":3, "y":1},
-                {"label":"E", "x":4, "y":1},
-                {"label":"R", "x":5, "y":1},
-                {"label":"T", "x":6, "y":1},
-                {"label":"PgUp", "x":7, "y":1, "w":1.5},
-                {"label":"PgDn", "x":11.5, "y":1, "w":1.5},
-                {"label":"Y", "x":13, "y":1},
-                {"label":"U", "x":14, "y":1},
-                {"label":"I", "x":15, "y":1},
-                {"label":"O", "x":16, "y":1},
-                {"label":"P", "x":17, "y":1},
-                {"label":"\\", "x":18, "y":1, "w":1.5},
-                {"label":"Control", "x":0.25, "y":2, "w":1.5},
-                {"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":"Del", "x":6.75, "y":2, "w":1.5},
-                {"label":"BS", "x":11.75, "y":2, "w":1.5},
-                {"label":"H", "x":13.25, "y":2},
-                {"label":"J", "x":14.25, "y":2},
-                {"label":"K", "x":15.25, "y":2},
-                {"label":"L", "x":16.25, "y":2},
-                {"label":";", "x":17.25, "y":2},
-                {"label":"Enter", "x":18.25, "y":2, "w":1.5},
-                {"label":"Shift", "x":0, "y":3, "w":1.5},
-                {"label":"Z", "x":1.5, "y":3},
-                {"label":"X", "x":2.5, "y":3},
-                {"label":"C", "x":3.5, "y":3},
-                {"label":"V", "x":4.5, "y":3},
-                {"label":"B", "x":5.5, "y":3},
-                {"label":"Fn", "x":6.5, "y":3},
-                {"label":"Fn", "x":12.5, "y":3},
-                {"label":"N", "x":13.5, "y":3},
-                {"label":"M", "x":14.5, "y":3},
-                {"label":",", "x":15.5, "y":3},
-                {"label":".", "x":16.5, "y":3},
-                {"label":"/", "x":17.5, "y":3},
-                {"label":"Shift", "x":18.5, "y":3, "w":1.5},
-                {"label":"Fn", "x":0, "y":4},
-                {"label":"Alt", "x":1, "y":4},
-                {"label":"Meta", "x":2, "y":4},
-                {"label":"TF", "x":3, "y":4},
-                {"label":"QB", "x":4, "y":4},
-                {"label":"Menu", "x":5, "y":4},
-                {"label":"Menu", "x":14, "y":4},
-                {"label":"QB", "x":15, "y":4},
-                {"label":"TF", "x":16, "y":4},
-                {"label":"Meta", "x":17, "y":4},
-                {"label":"Alt", "x":18, "y":4},
-                {"label":"Fn", "x":19, "y":4},
-                {"label":"F1", "x":7.5, "y":4, "r":30, "rx":7, "ry":3.5},
-                {"label":"F2", "x":8.5, "y":4, "r":30, "rx":7, "ry":3.5},
-                {"label":"F7", "x":10.5, "y":4, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F8", "x":11.5, "y":4, "r":-30, "rx":13, "ry":3.5},
-                {"x":6.5, "y":5, "h":2, "r":30, "rx":7, "ry":3.5},
-                {"label":"F3", "x":7.5, "y":5, "r":30, "rx":7, "ry":3.5},
-                {"label":"F4", "x":8.5, "y":5, "r":30, "rx":7, "ry":3.5},
-                {"label":"F9", "x":10.5, "y":5, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F10", "x":11.5, "y":5, "r":-30, "rx":13, "ry":3.5},
-                {"x":12.5, "y":5, "h":2, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F5", "x":7.5, "y":6, "r":30, "rx":7, "ry":3.5},
-                {"label":"F6", "x":8.5, "y":6, "r":30, "rx":7, "ry":3.5},
-                {"label":"F11", "x":10.5, "y":6, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F12", "x":11.5, "y":6, "r":-30, "rx":13, "ry":3.5}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+                {"matrix": [10, 6], "x": 11.5, "y": 0, "w": 1.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 0},
+                {"matrix": [6, 5], "x": 13.75, "y": 0},
+                {"matrix": [6, 4], "x": 14.75, "y": 0},
+                {"matrix": [6, 3], "x": 15.75, "y": 0},
+                {"matrix": [6, 2], "x": 16.75, "y": 0},
+                {"matrix": [6, 1], "x": 17.75, "y": 0},
+                {"matrix": [6, 0], "x": 18.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+                {"matrix": [7, 6], "x": 11.5, "y": 1, "w": 1.5},
+                {"matrix": [7, 5], "x": 13, "y": 1},
+                {"matrix": [7, 4], "x": 14, "y": 1},
+                {"matrix": [7, 3], "x": 15, "y": 1},
+                {"matrix": [7, 2], "x": 16, "y": 1},
+                {"matrix": [7, 1], "x": 17, "y": 1},
+                {"matrix": [7, 0], "x": 18, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 11.75, "y": 2, "w": 1.5},
+                {"matrix": [8, 5], "x": 13.25, "y": 2},
+                {"matrix": [8, 4], "x": 14.25, "y": 2},
+                {"matrix": [8, 3], "x": 15.25, "y": 2},
+                {"matrix": [8, 2], "x": 16.25, "y": 2},
+                {"matrix": [8, 1], "x": 17.25, "y": 2},
+                {"matrix": [8, 0], "x": 18.25, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+                {"matrix": [9, 6], "x": 12.5, "y": 3},
+                {"matrix": [9, 5], "x": 13.5, "y": 3},
+                {"matrix": [9, 4], "x": 14.5, "y": 3},
+                {"matrix": [9, 3], "x": 15.5, "y": 3},
+                {"matrix": [9, 2], "x": 16.5, "y": 3},
+                {"matrix": [9, 1], "x": 17.5, "y": 3},
+                {"matrix": [9, 0], "x": 18.5, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [10, 5], "x": 14, "y": 4},
+                {"matrix": [10, 4], "x": 15, "y": 4},
+                {"matrix": [10, 3], "x": 16, "y": 4},
+                {"matrix": [10, 2], "x": 17, "y": 4},
+                {"matrix": [10, 1], "x": 18, "y": 4},
+                {"matrix": [10, 0], "x": 19, "y": 4},
+
+                {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 2], "x": 10.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 1], "x": 11.5, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 4], "x": 10.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 3], "x": 11.5, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 0], "x": 12.5, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [11, 6], "x": 10.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [11, 5], "x": 11.5, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
             ]
         },
         "LAYOUT_left_half_only": {
             "layout": [
-                {"label":"Esc", "x":0.25, "y":0},
-                {"label":"~", "x":1.25, "y":0},
-                {"label":"1", "x":2.25, "y":0},
-                {"label":"2", "x":3.25, "y":0},
-                {"label":"3", "x":4.25, "y":0},
-                {"label":"4", "x":5.25, "y":0},
-                {"label":"5", "x":6.25, "y":0},
-                {"label":"Home", "x":7.25, "y":0, "w":1.25},
-                {"label":"Tab", "x":0.5, "y":1, "w":1.5},
-                {"label":"Q", "x":2, "y":1},
-                {"label":"W", "x":3, "y":1},
-                {"label":"E", "x":4, "y":1},
-                {"label":"R", "x":5, "y":1},
-                {"label":"T", "x":6, "y":1},
-                {"label":"PgUp", "x":7, "y":1, "w":1.5},
-                {"label":"Control", "x":0.25, "y":2, "w":1.5},
-                {"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":"Del", "x":6.75, "y":2, "w":1.5},
-                {"label":"Shift", "x":0, "y":3, "w":1.5},
-                {"label":"Z", "x":1.5, "y":3},
-                {"label":"X", "x":2.5, "y":3},
-                {"label":"C", "x":3.5, "y":3},
-                {"label":"V", "x":4.5, "y":3},
-                {"label":"B", "x":5.5, "y":3},
-                {"label":"Fn", "x":6.5, "y":3},
-                {"label":"Fn", "x":0, "y":4},
-                {"label":"Alt", "x":1, "y":4},
-                {"label":"Meta", "x":2, "y":4},
-                {"label":"TF", "x":3, "y":4},
-                {"label":"QB", "x":4, "y":4},
-                {"label":"Menu", "x":5, "y":4},
-                {"label":"F1", "x":7.5, "y":4, "r":30, "rx":7, "ry":3.5},
-                {"label":"F2", "x":8.5, "y":4, "r":30, "rx":7, "ry":3.5},
-                {"x":6.5, "y":5, "h":2, "r":30, "rx":7, "ry":3.5},
-                {"label":"F3", "x":7.5, "y":5, "r":30, "rx":7, "ry":3.5},
-                {"label":"F4", "x":8.5, "y":5, "r":30, "rx":7, "ry":3.5},
-                {"label":"F5", "x":7.5, "y":6, "r":30, "rx":7, "ry":3.5},
-                {"label":"F6", "x":8.5, "y":6, "r":30, "rx":7, "ry":3.5}
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [4, 6], "x": 7.25, "y": 0, "w": 1.25},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+
+                {"matrix": [5, 1], "x": 7.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 2], "x": 8.5, "y": 4, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [5, 0], "x": 6.5, "y": 5, "h": 2, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 4], "x": 8.5, "y": 5, "r": 30, "rx": 7, "ry": 3.5},
+
+                {"matrix": [5, 5], "x": 7.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 6, "r": 30, "rx": 7, "ry": 3.5}
             ]
         },
         "LAYOUT_right_half_only": {
             "layout": [
-                {"label":"End", "x":1, "y":0, "w":1.25},
-                {"label":"6", "x":2.25, "y":0},
-                {"label":"7", "x":3.25, "y":0},
-                {"label":"8", "x":4.25, "y":0},
-                {"label":"9", "x":5.25, "y":0},
-                {"label":"0", "x":6.25, "y":0},
-                {"label":"-", "x":7.25, "y":0},
-                {"label":"=", "x":8.25, "y":0},
-                {"label":"PgDn", "x":1, "y":1, "w":1.5},
-                {"label":"Y", "x":2.5, "y":1},
-                {"label":"U", "x":3.5, "y":1},
-                {"label":"I", "x":4.5, "y":1},
-                {"label":"O", "x":5.5, "y":1},
-                {"label":"P", "x":6.5, "y":1},
-                {"label":"\\", "x":7.5, "y":1, "w":1.5},
-                {"label":"BS", "x":1.25, "y":2, "w":1.5},
-                {"label":"H", "x":2.75, "y":2},
-                {"label":"J", "x":3.75, "y":2},
-                {"label":"K", "x":4.75, "y":2},
-                {"label":"L", "x":5.75, "y":2},
-                {"label":";", "x":6.75, "y":2},
-                {"label":"Enter", "x":7.75, "y":2, "w":1.5},
-                {"label":"Fn", "x":2, "y":3},
-                {"label":"N", "x":3, "y":3},
-                {"label":"M", "x":4, "y":3},
-                {"label":",", "x":5, "y":3},
-                {"label":".", "x":6, "y":3},
-                {"label":"/", "x":7, "y":3},
-                {"label":"Shift", "x":8, "y":3, "w":1.5},
-                {"label":"Menu", "x":3.5, "y":4},
-                {"label":"QB", "x":4.5, "y":4},
-                {"label":"TF", "x":5.5, "y":4},
-                {"label":"Meta", "x":6.5, "y":4},
-                {"label":"Alt", "x":7.5, "y":4},
-                {"label":"Fn", "x":8.5, "y":4},
-                {"label":"F7", "x":0, "y":4, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F8", "x":1, "y":4, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F9", "x":0, "y":5, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F10", "x":1, "y":5, "r":-30, "rx":13, "ry":3.5},
-                {"x":2, "y":5, "h":2, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F11", "x":0, "y":6, "r":-30, "rx":13, "ry":3.5},
-                {"label":"F12", "x":1, "y":6, "r":-30, "rx":13, "ry":3.5}
+                {"matrix": [4, 6], "x": 1, "y": 0, "w": 1.25},
+                {"matrix": [0, 6], "x": 2.25, "y": 0},
+                {"matrix": [0, 5], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 2], "x": 6.25, "y": 0},
+                {"matrix": [0, 1], "x": 7.25, "y": 0},
+                {"matrix": [0, 0], "x": 8.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 3], "x": 4.5, "y": 1},
+                {"matrix": [1, 2], "x": 5.5, "y": 1},
+                {"matrix": [1, 1], "x": 6.5, "y": 1},
+                {"matrix": [1, 0], "x": 7.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 6], "x": 1.25, "y": 2, "w": 1.5},
+                {"matrix": [2, 5], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 3], "x": 4.75, "y": 2},
+                {"matrix": [2, 2], "x": 5.75, "y": 2},
+                {"matrix": [2, 1], "x": 6.75, "y": 2},
+                {"matrix": [2, 0], "x": 7.75, "y": 2, "w": 1.5},
+
+                {"matrix": [3, 6], "x": 2, "y": 3},
+                {"matrix": [3, 5], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 3], "x": 5, "y": 3},
+                {"matrix": [3, 2], "x": 6, "y": 3},
+                {"matrix": [3, 1], "x": 7, "y": 3},
+                {"matrix": [3, 0], "x": 8, "y": 3, "w": 1.5},
+
+                {"matrix": [4, 5], "x": 3.5, "y": 4},
+                {"matrix": [4, 4], "x": 4.5, "y": 4},
+                {"matrix": [4, 3], "x": 5.5, "y": 4},
+                {"matrix": [4, 2], "x": 6.5, "y": 4},
+                {"matrix": [4, 1], "x": 7.5, "y": 4},
+                {"matrix": [4, 0], "x": 8.5, "y": 4},
+
+                {"matrix": [5, 2], "x": 0, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 1], "x": 1, "y": 4, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 4], "x": 0, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 3], "x": 1, "y": 5, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 0], "x": 2, "y": 5, "h": 2, "r": -30, "rx": 13, "ry": 3.5},
+
+                {"matrix": [5, 6], "x": 0, "y": 6, "r": -30, "rx": 13, "ry": 3.5},
+                {"matrix": [5, 5], "x": 1, "y": 6, "r": -30, "rx": 13, "ry": 3.5}
             ]
         }
     }
diff --git a/keyboards/whale/sk/v3/v3.c b/keyboards/whale/sk/v3/v3.c
index 30ffc4dcce..4cfb87e401 100644
--- a/keyboards/whale/sk/v3/v3.c
+++ b/keyboards/whale/sk/v3/v3.c
@@ -1,4 +1,4 @@
-#include "v3.h"
+#include "quantum.h"
 
 #if defined(__AVR__)
 #    include <avr/io.h>
diff --git a/keyboards/whale/sk/v3/v3.h b/keyboards/whale/sk/v3/v3.h
deleted file mode 100644
index a392705a83..0000000000
--- a/keyboards/whale/sk/v3/v3.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03, L04, L05, L06, L46,     R46, R06, R05, R04, R03, R02, R01, R00, \
-       L10, L11, L12, L13, L14, L15, L16,         R16, R15, R14, R13, R12, R11, R10, \
-      L20, L21, L22, L23, L24, L25, L26,           R26, R25, R24, R23, R22, R21, R20, \
-     L30, L31, L32, L33, L34, L35, L36,             R36, R35, R34, R33, R32, R31, R30, \
-    L40, L41, L42, L43, L44, L45,                         R45, R44, R43, R42, R41, R40, \
-                                  L51, L52,     R52, R51, \
-                             L50, L53, L54,     R54, R53, R50, \
-                                  L55, L56,     R56, R55  \
-) { \
-    {L00, L01, L02, L03, L04, L05, L06, }, \
-    {L10, L11, L12, L13, L14, L15, L16, }, \
-    {L20, L21, L22, L23, L24, L25, L26, }, \
-    {L30, L31, L32, L33, L34, L35, L36, }, \
-    {L40, L41, L42, L43, L44, L45, L46, }, \
-    {L50, L51, L52, L53, L54, L55, L56, }, \
-    {R00, R01, R02, R03, R04, R05, R06, }, \
-    {R10, R11, R12, R13, R14, R15, R16, }, \
-    {R20, R21, R22, R23, R24, R25, R26, }, \
-    {R30, R31, R32, R33, R34, R35, R36, }, \
-    {R40, R41, R42, R43, R44, R45, R46, }, \
-    {R50, R51, R52, R53, R54, R55, R56 } \
-}
-
-#define LAYOUT_left_half_only(\
-    L00, L01, L02, L03, L04, L05, L06, L46, \
-       L10, L11, L12, L13, L14, L15, L16,   \
-      L20, L21, L22, L23, L24, L25, L26,    \
-     L30, L31, L32, L33, L34, L35, L36,     \
-    L40, L41, L42, L43, L44, L45,           \
-                                  L51, L52, \
-                             L50, L53, L54, \
-                                  L55, L56 \
-) { \
-    {L00, L01, L02, L03, L04, L05, L06, }, \
-    {L10, L11, L12, L13, L14, L15, L16, }, \
-    {L20, L21, L22, L23, L24, L25, L26, }, \
-    {L30, L31, L32, L33, L34, L35, L36, }, \
-    {L40, L41, L42, L43, L44, L45, L46, }, \
-    {L50, L51, L52, L53, L54, L55, L56 } \
-}
-
-#define LAYOUT_right_half_only( \
-    R46, R06, R05, R04, R03, R02, R01, R00, \
-     R16, R15, R14, R13, R12, R11, R10, \
-      R26, R25, R24, R23, R22, R21, R20, \
-       R36, R35, R34, R33, R32, R31, R30, \
-        R45, R44, R43, R42, R41, R40, \
-     R52, R51, \
-     R54, R53, R50, \
-     R56, R55  \
-) { \
-    {R00, R01, R02, R03, R04, R05, R06, }, \
-    {R10, R11, R12, R13, R14, R15, R16, }, \
-    {R20, R21, R22, R23, R24, R25, R26, }, \
-    {R30, R31, R32, R33, R34, R35, R36, }, \
-    {R40, R41, R42, R43, R44, R45, R46, }, \
-    {R50, R51, R52, R53, R54, R55, R56 } \
-}