Move `default` layouts to data driven (#20349)

2 files changed, 278 insertions, 100 deletions

diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/info.json
index 7e0c7c4c03..52cf5823a0 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/info.json
@@ -15,15 +15,283 @@
   "diode_direction": "COL2ROW",
   "processor": "STM32F072",
   "bootloader": "stm32-dfu",
-  "layouts": {
-    "LAYOUT_default": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
-    },
-    "LAYOUT_split_bs": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Delete", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
-    },
-    "LAYOUT_all": {
-      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"x":15.25, "y":0}, {"label":"Back", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":1.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "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.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "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.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 8], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "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.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [1, 3], "x": 7.25, "y": 0},
+                {"matrix": [0, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 4], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+
+                {"matrix": [2, 1], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 3.75, "y": 1},
+                {"matrix": [2, 2], "x": 4.75, "y": 1},
+                {"matrix": [3, 2], "x": 5.75, "y": 1},
+                {"matrix": [2, 3], "x": 6.75, "y": 1},
+                {"matrix": [3, 3], "x": 7.75, "y": 1},
+                {"matrix": [2, 4], "x": 8.75, "y": 1},
+                {"matrix": [3, 4], "x": 9.75, "y": 1},
+                {"matrix": [2, 5], "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "x": 11.75, "y": 1},
+                {"matrix": [2, 6], "x": 12.75, "y": 1},
+                {"matrix": [3, 6], "x": 13.75, "y": 1},
+                {"matrix": [2, 7], "x": 14.75, "y": 1},
+                {"matrix": [2, 8], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [3, 8], "x": 17.25, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+
+                {"matrix": [4, 1], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [5, 4], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 5], "x": 12, "y": 2},
+                {"matrix": [4, 6], "x": 13, "y": 2},
+                {"matrix": [5, 6], "x": 14, "y": 2},
+                {"matrix": [4, 7], "x": 15, "y": 2},
+                {"matrix": [4, 8], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+
+                {"matrix": [6, 1], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 1], "x": 3.5, "y": 3},
+                {"matrix": [6, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 2], "x": 5.5, "y": 3},
+                {"matrix": [6, 3], "x": 6.5, "y": 3},
+                {"matrix": [7, 3], "x": 7.5, "y": 3},
+                {"matrix": [6, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 4], "x": 9.5, "y": 3},
+                {"matrix": [6, 5], "x": 10.5, "y": 3},
+                {"matrix": [7, 5], "x": 11.5, "y": 3},
+                {"matrix": [6, 6], "x": 12.5, "y": 3},
+                {"matrix": [7, 6], "x": 13.5, "y": 3},
+                {"matrix": [6, 7], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [6, 8], "x": 16.25, "y": 3},
+                {"matrix": [7, 8], "x": 17.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 0, "y": 4},
+                {"matrix": [9, 0], "x": 1, "y": 4},
+
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 4], "x": 6, "y": 4, "w": 6.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [8, 7], "x": 15.25, "y": 4},
+                {"matrix": [8, 8], "x": 16.25, "y": 4},
+                {"matrix": [9, 8], "x": 17.25, "y": 4}
+            ]
+        }
     }
 }
-}
diff --git a/keyboards/viktus/styrka/styrka.h b/keyboards/viktus/styrka/styrka.h
deleted file mode 100644
index 81d1a76f70..0000000000
--- a/keyboards/viktus/styrka/styrka.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright 2020 jrfhoutx
- *
- * 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 ___ KC_NO
-
-/* This 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.
- *
- *
- * Use LAYOUT_all for ISO and Tsangan builds
- *
- */
-
-#define LAYOUT_default( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,      K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
-    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96, K87,      K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, ___, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}
-#define LAYOUT_split_bs( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
-    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}
-#define LAYOUT_all( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47,      K48, K58, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
-    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
-    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, K78 }, \
-    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
-    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
-}