Move single `LAYOUT_all`s to data driven (#20430)

9 files changed, 299 insertions, 266 deletions

diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json
index e9727d48ff..64daf9b44c 100644
--- a/keyboards/viktus/smolka/info.json
+++ b/keyboards/viktus/smolka/info.json
@@ -27,61 +27,69 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.25},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1, "w":1.75},
-                {"x":14.25, "y":1},
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2, "w":1.25},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":0, "y":3},
-                {"x":1.25, "y":3, "w":1.25},
-                {"x":2.5, "y":3},
-                {"x":3.5, "y":3, "w":1.25},
-                {"x":4.75, "y":3, "w":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3, "w":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":12.25, "y":3},
-                {"x":13.25, "y":3},
-                {"x":14.25, "y":3}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [0, 4], "x": 7.25, "y": 0},
+                {"matrix": [1, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 5], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [0, 6], "x": 11.25, "y": 0},
+                {"matrix": [1, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 7], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 5], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1, "w": 1.75},
+                {"matrix": [2, 7], "x": 14.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.25, "y": 2},
+                {"matrix": [4, 7], "x": 14.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3},
+
+                {"matrix": [7, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 2.5, "y": 3},
+                {"matrix": [6, 2], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 4.75, "y": 3, "w": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 4], "x": 8.75, "y": 3, "w": 3},
+                {"matrix": [7, 5], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+
+                {"matrix": [7, 6], "x": 12.25, "y": 3},
+                {"matrix": [7, 7], "x": 13.25, "y": 3},
+                {"matrix": [6, 7], "x": 14.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/viktus/smolka/smolka.c b/keyboards/viktus/smolka/smolka.c
index e11b80670b..862127019f 100644
--- a/keyboards/viktus/smolka/smolka.c
+++ b/keyboards/viktus/smolka/smolka.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "smolka.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/viktus/smolka/smolka.h b/keyboards/viktus/smolka/smolka.h
deleted file mode 100644
index b6692cea22..0000000000
--- a/keyboards/viktus/smolka/smolka.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 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 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( \
-    K10, K11, K01, K02, K12, K13, K03, K04, K14, K15, K05, K06, K16, K17, K07, \
-    K30, K31, K21, K22, K32, K33, K23, K24, K34, K35, K25, K26,      K37, K27, \
-    K50, K51, K41, K42, K52, K53, K43, K44, K54, K55, K45,      K56, K57, K47, \
-    K70, K71, K61, K62,      K73, K63,      K74, K75, K65,      K76, K77, K67  \
-) \
-{ \
-    { ___, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { ___, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { ___, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { ___, K61, K62, K63, ___, K65, ___, K67 }, \
-    { K70, K71, ___, K73, K74, K75, K76, K77 }  \
-}
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/info.json
index 76cdbb7c03..752b992b02 100644
--- a/keyboards/viktus/sp111/info.json
+++ b/keyboards/viktus/sp111/info.json
@@ -13,12 +13,150 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"F13", "x":0, "y":0}, {"label":"F14", "x":1, "y":0}, {"label":"F15", "x":2, "y":0}, {"label":"F16", "x":3, "y":0}, {"label":"Esc", "x":4.5, "y":0}, {"label":"F1", "x":5.75, "y":0}, {"label":"F2", "x":6.75, "y":0}, {"label":"F3", "x":7.75, "y":0}, {"label":"F4", "x":8.75, "y":0}, {"label":"F5", "x":10, "y":0}, {"label":"F6", "x":11, "y":0}, {"label":"F7", "x":12.75, "y":0}, {"label":"F8", "x":13.75, "y":0}, {"label":"F9", "x":15, "y":0}, {"label":"F10", "x":16, "y":0}, {"label":"F11", "x":17, "y":0}, {"label":"F12", "x":18, "y":0}, {"label":"Prt Scn", "x":19.25, "y":0}, {"label":"Scl Lck", "x":20.5, "y":0}, {"label":"Pause", "x":21.5, "y":0},
-                {"label":"Num Lock", "x":0, "y":1.5}, {"label":"/", "x":1, "y":1.5}, {"label":"*", "x":2, "y":1.5}, {"label":"-", "x":3, "y":1.5}, {"label":"~", "x":4.5, "y":1.5}, {"label":"!", "x":5.5, "y":1.5}, {"label":"@", "x":6.5, "y":1.5}, {"label":"#", "x":7.5, "y":1.5}, {"label":"$", "x":8.5, "y":1.5}, {"label":"%", "x":9.5, "y":1.5}, {"label":"^", "x":10.5, "y":1.5}, {"label":"&", "x":12.25, "y":1.5}, {"label":"*", "x":13.25, "y":1.5}, {"label":"(", "x":14.25, "y":1.5}, {"label":")", "x":15.25, "y":1.5}, {"label":"_", "x":16.25, "y":1.5}, {"label":"+", "x":17.25, "y":1.5}, {"label":"Backspace", "x":18.25, "y":1.5}, {"label":"Backspace2", "x":19.25, "y":1.5}, {"label":"Home", "x":20.5, "y":1.5}, {"label":"Insert", "x":21.5, "y":1.5},
-                {"label":"7", "x":0, "y":2.5}, {"label":"8", "x":1, "y":2.5}, {"label":"9", "x":2, "y":2.5}, {"label":"+", "x":3, "y":2.5}, {"label":"Tab", "x":4.5, "y":2.5, "w":1.5}, {"label":"Q", "x":6, "y":2.5}, {"label":"W", "x":7, "y":2.5}, {"label":"E", "x":8, "y":2.5}, {"label":"R", "x":9, "y":2.5}, {"label":"T", "x":10, "y":2.5}, {"label":"Y", "x":11.75, "y":2.5}, {"label":"U", "x":12.75, "y":2.5}, {"label":"I", "x":13.75, "y":2.5}, {"label":"O", "x":14.75, "y":2.5}, {"label":"P", "x":15.75, "y":2.5}, {"label":"{", "x":16.75, "y":2.5}, {"label":"}", "x":17.75, "y":2.5}, {"label":"|", "x":18.75, "y":2.5, "w":1.5}, {"label":"End", "x":20.5, "y":2.5}, {"label":"Delete", "x":21.5, "y":2.5},
-                {"label":"4", "x":0, "y":3.5}, {"label":"5", "x":1, "y":3.5}, {"label":"6", "x":2, "y":3.5}, {"label":"=", "x":3, "y":3.5}, {"label":"Caps Lock", "x":4.5, "y":3.5, "w":1.75}, {"label":"A", "x":6.25, "y":3.5}, {"label":"S", "x":7.25, "y":3.5}, {"label":"D", "x":8.25, "y":3.5}, {"label":"F", "x":9.25, "y":3.5}, {"label":"G", "x":10.25, "y":3.5}, {"label":"H", "x":12, "y":3.5}, {"label":"J", "x":13, "y":3.5}, {"label":"K", "x":14, "y":3.5}, {"label":"L", "x":15, "y":3.5}, {"label":":", "x":16, "y":3.5}, {"label":"\"", "x":17, "y":3.5}, {"label":"#", "x":18, "y":3.5}, {"label":"Enter", "x":19, "y":3.5, "w":1.25}, {"label":"PgUp", "x":20.5, "y":3.5}, {"label":"PgDn", "x":21.5, "y":3.5},
-                {"label":"1", "x":0, "y":4.5}, {"label":"2", "x":1, "y":4.5}, {"label":"3", "x":2, "y":4.5}, {"label":"Enter", "x":3, "y":4.5}, {"label":"Shift", "x":4.5, "y":4.5, "w":1.25}, {"label":"numbs", "x":5.75, "y":4.5}, {"label":"Z", "x":6.75, "y":4.5}, {"label":"X", "x":7.75, "y":4.5}, {"label":"C", "x":8.75, "y":4.5}, {"label":"V", "x":9.75, "y":4.5}, {"label":"B", "x":10.75, "y":4.5}, {"label":"N", "x":12.5, "y":4.5}, {"label":"M", "x":13.5, "y":4.5}, {"label":"<", "x":14.5, "y":4.5}, {"label":">", "x":15.5, "y":4.5}, {"label":"?", "x":16.5, "y":4.5}, {"label":"Shift", "x":17.5, "y":4.5, "w":1.75}, {"label":"Fn", "x":19.25, "y":4.5}, {"label":"\u2191", "x":20.5, "y":4.75},
-                {"label":"0", "x":0, "y":5.5}, {"label":"00", "x":1, "y":5.5}, {"label":".", "x":2, "y":5.5}, {"label":"..", "x":3, "y":5.5}, {"label":"Ctrl", "x":4.5, "y":5.5, "w":1.25}, {"label":"Code", "x":5.75, "y":5.5, "w":1.25}, {"label":"Alt", "x":7, "y":5.5, "w":1.25}, {"label":"Fn", "x":8.25, "y":5.5}, {"label":"", "x":9.25, "y":5.5, "w":2.25}, {"label":"", "x":12.25, "y":5.5, "w":2.25}, {"label":"", "x":14.5, "y":5.5}, {"label":"Alt", "x":15.5, "y":5.5, "w":1.25}, {"label":"Code", "x":16.75, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":18, "y":5.5, "w":1.25}, {"label":"\u2190", "x":19.5, "y":5.75}, {"label":"\u2193", "x":20.5, "y":5.75}, {"label":"\u2192", "x":21.5, "y":5.75}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+
+                {"matrix": [6, 1], "x": 12.75, "y": 0},
+                {"matrix": [6, 2], "x": 13.75, "y": 0},
+
+                {"matrix": [6, 3], "x": 15, "y": 0},
+                {"matrix": [6, 4], "x": 16, "y": 0},
+                {"matrix": [6, 5], "x": 17, "y": 0},
+                {"matrix": [6, 6], "x": 18, "y": 0},
+
+                {"matrix": [6, 7], "x": 19.25, "y": 0},
+
+                {"matrix": [6, 8], "x": 20.5, "y": 0},
+                {"matrix": [6, 9], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 4.5, "y": 1.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.5},
+
+                {"matrix": [7, 0], "x": 12.25, "y": 1.5},
+                {"matrix": [7, 1], "x": 13.25, "y": 1.5},
+                {"matrix": [7, 2], "x": 14.25, "y": 1.5},
+                {"matrix": [7, 3], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.5},
+                {"matrix": [7, 6], "x": 18.25, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.25, "y": 1.5},
+
+                {"matrix": [7, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 9], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 5], "x": 6, "y": 2.5},
+                {"matrix": [2, 6], "x": 7, "y": 2.5},
+                {"matrix": [2, 7], "x": 8, "y": 2.5},
+                {"matrix": [2, 8], "x": 9, "y": 2.5},
+                {"matrix": [2, 9], "x": 10, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 11.75, "y": 2.5},
+                {"matrix": [8, 1], "x": 12.75, "y": 2.5},
+                {"matrix": [8, 2], "x": 13.75, "y": 2.5},
+                {"matrix": [8, 3], "x": 14.75, "y": 2.5},
+                {"matrix": [8, 4], "x": 15.75, "y": 2.5},
+                {"matrix": [8, 5], "x": 16.75, "y": 2.5},
+                {"matrix": [8, 6], "x": 17.75, "y": 2.5},
+                {"matrix": [8, 7], "x": 18.75, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 9], "x": 21.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3, "y": 3.5},
+
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.5},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.5},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.5},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.5},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 12, "y": 3.5},
+                {"matrix": [9, 1], "x": 13, "y": 3.5},
+                {"matrix": [9, 2], "x": 14, "y": 3.5},
+                {"matrix": [9, 3], "x": 15, "y": 3.5},
+                {"matrix": [9, 4], "x": 16, "y": 3.5},
+                {"matrix": [9, 5], "x": 17, "y": 3.5},
+                {"matrix": [9, 6], "x": 18, "y": 3.5},
+                {"matrix": [9, 7], "x": 19, "y": 3.5, "w": 1.25},
+
+                {"matrix": [9, 8], "x": 20.5, "y": 3.5},
+                {"matrix": [9, 9], "x": 21.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5},
+                {"matrix": [4, 1], "x": 1, "y": 4.5},
+                {"matrix": [4, 2], "x": 2, "y": 4.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5},
+
+                {"matrix": [4, 4], "x": 4.5, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+
+                {"matrix": [10, 1], "x": 12.5, "y": 4.5},
+                {"matrix": [10, 2], "x": 13.5, "y": 4.5},
+                {"matrix": [10, 3], "x": 14.5, "y": 4.5},
+                {"matrix": [10, 4], "x": 15.5, "y": 4.5},
+                {"matrix": [10, 5], "x": 16.5, "y": 4.5},
+                {"matrix": [10, 6], "x": 17.5, "y": 4.5, "w": 1.75},
+                {"matrix": [10, 7], "x": 19.25, "y": 4.5},
+
+                {"matrix": [10, 8], "x": 20.5, "y": 4.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5},
+                {"matrix": [5, 1], "x": 1, "y": 5.5},
+                {"matrix": [5, 2], "x": 2, "y": 5.5},
+                {"matrix": [5, 3], "x": 3, "y": 5.5},
+
+                {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 5.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 7, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 9.25, "y": 5.5, "w": 2.25},
+
+                {"matrix": [11, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+                {"matrix": [11, 3], "x": 14.5, "y": 5.5},
+                {"matrix": [11, 4], "x": 15.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 16.75, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 18, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 19.5, "y": 5.75},
+                {"matrix": [11, 8], "x": 20.5, "y": 5.75},
+                {"matrix": [11, 9], "x": 21.5, "y": 5.75}
             ]
         }
     }
diff --git a/keyboards/viktus/sp111/sp111.c b/keyboards/viktus/sp111/sp111.c
index 737334998d..523666ed73 100644
--- a/keyboards/viktus/sp111/sp111.c
+++ b/keyboards/viktus/sp111/sp111.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 "sp111.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // enable built in pullups to avoid timeouts when right hand not connected
diff --git a/keyboards/viktus/sp111/sp111.h b/keyboards/viktus/sp111/sp111.h
deleted file mode 100644
index b5f3a97d85..0000000000
--- a/keyboards/viktus/sp111/sp111.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 blindassassin111
- *
- * 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
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03,   L04, L05, L06, L07, L08, L09, L0A,        R01, R02,   R03, R04, R05, R06,   R07, R08, R09, \
-    L10, L11, L12, L13,   L14, L15, L16, L17, L18, L19, L0B,    R10, R11, R12, R13, R14, R15, R16, R17,    R18, R19, \
-    L20, L21, L22, L23,   L24, L25, L26, L27, L28, L29,       R20, R21, R22, R23, R24, R25, R26, R27,      R28, R29, \
-    L30, L31, L32, L33,   L34, L35, L36, L37, L38, L39,     R30, R31, R32, R33, R34, R35, R36, R37,        R38, R39, \
-    L40, L41, L42, L43,   L44, L45, L46, L47, L48, L49, L4A,      R41, R42, R43, R44, R45, R46, R47,       R48,      \
-    L50, L51, L52, L53,    L54, L55, L56, L57, L58,                 R52, R53, R54, R55, R56,          R57, R49, R59  \
-) { \
-    { L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, L0A }, \
-    { L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, L0B }, \
-    { L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, ___ }, \
-    { L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, ___ }, \
-    { L40, L41, L42, L43, L44, L45, L46, L47, L48, L49, L4A }, \
-    { L50, L51, L52, L53, L54, L55, L56, L57, L58, ___, ___ }, \
-    { ___, R01, R02, R03, R04, R05, R06, R07, R08, R09, ___ }, \
-    { R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, ___ }, \
-    { R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, ___ }, \
-    { R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, ___ }, \
-    { ___, R41, R42, R43, R44, R45, R46, R47, R48, ___, ___ }, \
-    { ___, ___, R52, R53, R54, R55, R56, R57, R49, R59, ___ }  \
-}
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 4ac4e95913..d804182f4e 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -34,79 +34,95 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.75, "y":0},
-                {"x":8.75, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":13.75, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1.25},
-                {"label":"Esc", "x":1.25, "y":1.25},
-                {"label":"Q", "x":2.25, "y":1.25},
-                {"label":"W", "x":3.25, "y":1.25},
-                {"label":"E", "x":4.25, "y":1.25},
-                {"label":"R", "x":5.25, "y":1.25},
-                {"label":"T", "x":6.25, "y":1.25},
-                {"label":"Y", "x":7.75, "y":1.25},
-                {"label":"U", "x":8.75, "y":1.25},
-                {"label":"I", "x":9.75, "y":1.25},
-                {"label":"O", "x":10.75, "y":1.25},
-                {"label":"P", "x":11.75, "y":1.25},
-                {"label":"Delete", "x":12.75, "y":1.25},
-                {"label":"Back", "x":13.75, "y":1.25},
-                {"x":15, "y":1.25},
-
-                {"x":0, "y":2.25},
-                {"label":"Tab", "x":1.25, "y":2.25, "w":1.25},
-                {"label":"A", "x":2.5, "y":2.25},
-                {"label":"S", "x":3.5, "y":2.25},
-                {"label":"D", "x":4.5, "y":2.25},
-                {"label":"F", "x":5.5, "y":2.25},
-                {"label":"G", "x":6.5, "y":2.25},
-                {"label":"H", "x":8, "y":2.25},
-                {"label":"J", "x":9, "y":2.25},
-                {"label":"K", "x":10, "y":2.25},
-                {"label":"L", "x":11, "y":2.25},
-                {"label":"\"", "x":12, "y":2.25},
-                {"label":"Enter", "x":13, "y":2.25, "w":1.75},
-                {"x":15, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"label":"Shift", "x":1.25, "y":3.25, "w":1.75},
-                {"label":"Z", "x":3, "y":3.25},
-                {"label":"X", "x":4, "y":3.25},
-                {"label":"C", "x":5, "y":3.25},
-                {"label":"V", "x":6, "y":3.25},
-                {"label":"B", "x":7, "y":3.25},
-                {"label":"N", "x":8.5, "y":3.25},
-                {"label":"M", "x":9.5, "y":3.25},
-                {"label":"<", "x":10.5, "y":3.25},
-                {"label":">", "x":11.5, "y":3.25},
-                {"label":"Shift", "x":12.5, "y":3.25, "w":1.25},
-                {"label":"\u2191", "x":14, "y":3.5},
-
-                {"x":0, "y":4.25},
-                {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25},
-                {"label":"LAlt", "x":2.5, "y":4.25},
-                {"label":"LGUI", "x":3.5, "y":4.25},
-                {"label":"Fn1", "x":4.5, "y":4.25, "w":1.25},
-                {"label":"SPFn1", "x":5.75, "y":4.25, "w":2},
-                {"label":"BSFn2", "x":8.25, "y":4.25, "w":2.25},
-                {"label":"Alt", "x":10.5, "y":4.25, "w":1.25},
-                {"label":"Fn2", "x":11.75, "y":4.25},
-                {"label":"\u2190", "x":13, "y":4.5},
-                {"label":"\u2193", "x":14, "y":4.5},
-                {"label":"\u2192", "x":15, "y":4.5}]
+                {"matrix": [0, 0], "x": 0, "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": [5, 0], "x": 7.75, "y": 0},
+                {"matrix": [5, 1], "x": 8.75, "y": 0},
+                {"matrix": [5, 2], "x": 9.75, "y": 0},
+                {"matrix": [5, 3], "x": 10.75, "y": 0},
+                {"matrix": [5, 4], "x": 11.75, "y": 0},
+                {"matrix": [5, 5], "x": 12.75, "y": 0},
+                {"matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 8, "y": 2.25},
+                {"matrix": [7, 1], "x": 9, "y": 2.25},
+                {"matrix": [7, 2], "x": 10, "y": 2.25},
+                {"matrix": [7, 3], "x": 11, "y": 2.25},
+                {"matrix": [7, 4], "x": 12, "y": 2.25},
+                {"matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+                {"matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+                {"matrix": [9, 5], "x": 13, "y": 4.5},
+                {"matrix": [9, 6], "x": 14, "y": 4.5},
+                {"matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c
index c2ccc6db2f..ffae6c5c54 100644
--- a/keyboards/viktus/sp_mini/sp_mini.c
+++ b/keyboards/viktus/sp_mini/sp_mini.c
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-#include "sp_mini.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // enable built in pullups to avoid timeouts when right hand not connected
diff --git a/keyboards/viktus/sp_mini/sp_mini.h b/keyboards/viktus/sp_mini/sp_mini.h
deleted file mode 100644
index 6474a4f71e..0000000000
--- a/keyboards/viktus/sp_mini/sp_mini.h
+++ /dev/null
@@ -1,41 +0,0 @@
- /* Copyright 2021 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
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24,      R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,      \
-    L40, L41, L42, L43, L44, L45,                R42, R43, R44, R45, R46, R47  \
-    ) \
-    { \
-    { 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, ___     }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07}, \
-    { R10, R11, R12, R13, R14, R15, R16, R17}, \
-    { R20, R21, R22, R23, R24, ___, R26, R27}, \
-    { ___, R31, R32, R33, R34, R35, R36, ___}, \
-    { ___, ___, R42, R43, R44, R45, R46, R47}  \
-}