Move single `LAYOUT`s to data driven (#20365)

4 files changed, 255 insertions, 152 deletions

diff --git a/keyboards/viktus/at101_bh/at101_bh.h b/keyboards/viktus/at101_bh/at101_bh.h
deleted file mode 100644
index 54655cf60e..0000000000
--- a/keyboards/viktus/at101_bh/at101_bh.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, 			K0106, K0007, K0107, \
-	K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, 	K0207, K0307, K0208, 	K0308, K0209, K0309, K0009, \
-	K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, 	K0407, K0507, K0408, 	K0508, K0409, K0509, K0109, \
-	K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606,        							K0608, K0708, K0609, K0709, \
-	K0800, K1101, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, 		   K0807, 			K0808, K0908, K0809, K0909, \
-	K1000, K1100, K1001,  			   K1102,                     		  K1005, K1105, K1006, K1106, 	K1007, K1107, K1008, 		K1108, 	  K1009 \
-) { \
-	{ K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, KC_NO, K0009 }, \
-	{ K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, KC_NO, K0109 }, \
-	{ K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209 }, \
-	{ K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309 }, \
-	{ K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409 }, \
-	{ K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509 }, \
-	{ K0600, K0601, K0602, K0603, K0604, K0605, K0606, KC_NO, K0608, K0609 }, \
-	{ K0700, K0701, K0702, K0703, K0704, K0705, KC_NO, KC_NO, K0708, K0709 }, \
-	{ K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808, K0809 }, \
-	{ K0900, K0901, K0902, K0903, K0904, K0905, KC_NO, KC_NO, K0908, K0909 }, \
-	{ K1000, K1001, KC_NO, KC_NO, KC_NO, K1005, K1006, K1007, K1008, K1009 }, \
-	{ K1100, K1101, K1102, KC_NO, KC_NO, K1105, K1106, K1107, K1108, KC_NO }  \
-}
diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json
index 88b0c78b2d..6ecd53c36d 100644
--- a/keyboards/viktus/at101_bh/info.json
+++ b/keyboards/viktus/at101_bh/info.json
@@ -18,113 +18,131 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Esc", "x":0, "y":0},
-        {"label":"F1", "x":2, "y":0},
-        {"label":"F2", "x":3, "y":0},
-        {"label":"F3", "x":4, "y":0},
-        {"label":"F4", "x":5, "y":0},
-        {"label":"F5", "x":6.5, "y":0},
-        {"label":"F6", "x":7.5, "y":0},
-        {"label":"F7", "x":8.5, "y":0},
-        {"label":"F8", "x":9.5, "y":0},
-        {"label":"F9", "x":11, "y":0},
-        {"label":"F10", "x":12, "y":0},
-        {"label":"F11", "x":13, "y":0},
-        {"label":"F12", "x":14, "y":0},
-        {"label":"Print Screen", "x":15.25, "y":0},
-        {"label":"Scroll Lock", "x":16.25, "y":0},
-        {"label":"Pause", "x":17.25, "y":0},
-        {"label":"Grave", "x":0, "y":1.5},
-        {"label":"1", "x":1, "y":1.5},
-        {"label":"2", "x":2, "y":1.5},
-        {"label":"3", "x":3, "y":1.5},
-        {"label":"4", "x":4, "y":1.5},
-        {"label":"5", "x":5, "y":1.5},
-        {"label":"6", "x":6, "y":1.5},
-        {"label":"7", "x":7, "y":1.5},
-        {"label":"8", "x":8, "y":1.5},
-        {"label":"9", "x":9, "y":1.5},
-        {"label":"0", "x":10, "y":1.5},
-        {"label":"-", "x":11, "y":1.5},
-        {"label":"=", "x":12, "y":1.5},
-        {"label":"Backspace", "x":13, "y":1.5, "w":2},
-        {"label":"Insert", "x":15.25, "y":1.5},
-        {"label":"Home", "x":16.25, "y":1.5},
-        {"label":"Page Up", "x":17.25, "y":1.5},
-        {"label":"Num Lock", "x":18.5, "y":1.5},
-        {"label":"Keypad /", "x":19.5, "y":1.5},
-        {"label":"Keypad *", "x":20.5, "y":1.5},
-        {"label":"Keypad -", "x":21.5, "y":1.5},
-        {"label":"Tab", "x":0, "y":2.5, "w":1.5},
-        {"label":"Q", "x":1.5, "y":2.5},
-        {"label":"W", "x":2.5, "y":2.5},
-        {"label":"E", "x":3.5, "y":2.5},
-        {"label":"R", "x":4.5, "y":2.5},
-        {"label":"T", "x":5.5, "y":2.5},
-        {"label":"Y", "x":6.5, "y":2.5},
-        {"label":"U", "x":7.5, "y":2.5},
-        {"label":"I", "x":8.5, "y":2.5},
-        {"label":"O", "x":9.5, "y":2.5},
-        {"label":"P", "x":10.5, "y":2.5},
-        {"label":"LBracket", "x":11.5, "y":2.5},
-        {"label":"RBracket]", "x":12.5, "y":2.5},
-        {"label":"Backslash", "x":13.5, "y":2.5, "w":1.5},
-        {"label":"Delete", "x":15.25, "y":2.5},
-        {"label":"End", "x":16.25, "y":2.5},
-        {"label":"Page Down", "x":17.25, "y":2.5},
-        {"label":"Keypad 7", "x":18.5, "y":2.5},
-        {"label":"Keypad 8", "x":19.5, "y":2.5},
-        {"label":"Keypad 9", "x":20.5, "y":2.5},
-        {"label":"Keypad +", "x":21.5, "y":2.5},
-        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-        {"label":"A", "x":1.75, "y":3.5},
-        {"label":"S", "x":2.75, "y":3.5},
-        {"label":"D", "x":3.75, "y":3.5},
-        {"label":"F", "x":4.75, "y":3.5},
-        {"label":"G", "x":5.75, "y":3.5},
-        {"label":"H", "x":6.75, "y":3.5},
-        {"label":"J", "x":7.75, "y":3.5},
-        {"label":"K", "x":8.75, "y":3.5},
-        {"label":"L", "x":9.75, "y":3.5},
-        {"label":"Semicolon", "x":10.75, "y":3.5},
-        {"label":"Quote", "x":11.75, "y":3.5},
-        {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-        {"label":"Keypad 4", "x":18.5, "y":3.5},
-        {"label":"Keypad 5", "x":19.5, "y":3.5},
-        {"label":"Keypad 6", "x":20.5, "y":3.5},
-        {"label":"Keypad =", "x":21.5, "y":3.5},
-        {"label":"LShift", "x":0, "y":4.5, "w":1.25},
-        {"label":"ISO Backslash", "x":1.25, "y":4.5},
-        {"label":"Z", "x":2.25, "y":4.5},
-        {"label":"X", "x":3.25, "y":4.5},
-        {"label":"C", "x":4.25, "y":4.5},
-        {"label":"V", "x":5.25, "y":4.5},
-        {"label":"B", "x":6.25, "y":4.5},
-        {"label":"N", "x":7.25, "y":4.5},
-        {"label":"M", "x":8.25, "y":4.5},
-        {"label":"Comma", "x":9.25, "y":4.5},
-        {"label":"Period", "x":10.25, "y":4.5},
-        {"label":"Slash", "x":11.25, "y":4.5},
-        {"label":"RShift", "x":12.25, "y":4.5, "w":1.75},
-        {"label":"Fn", "x":14, "y":4.5},
-        {"label":"Up", "x":16.25, "y":4.5},
-        {"label":"Keypad 1", "x":18.5, "y":4.5},
-        {"label":"Keypad 2", "x":19.5, "y":4.5},
-        {"label":"Keypad 3", "x":20.5, "y":4.5},
-        {"label":"Keypad Enter", "x":21.5, "y":4.5, "h":2},
-        {"label":"LCtrl", "x":0, "y":5.5, "w":1.25},
-        {"label":"LGUI", "x":1.25, "y":5.5, "w":1.25},
-        {"label":"LAlt", "x":2.5, "y":5.5, "w":1.25},
-        {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-        {"label":"RAlt", "x":10, "y":5.5, "w":1.25},
-        {"label":"RGUI", "x":11.25, "y":5.5, "w":1.25},
-        {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-        {"label":"RCtrl", "x":13.75, "y":5.5, "w":1.25},
-        {"label":"Left", "x":15.25, "y":5.5},
-        {"label":"Down", "x":16.25, "y":5.5},
-        {"label":"Right", "x":17.25, "y":5.5},
-        {"label":"Keypad 0", "x":18.5, "y":5.5, "w":2},
-        {"label":"Keypad .", "x":20.5, "y":5.5}
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [1, 0], "x": 2, "y": 0},
+        {"matrix": [0, 1], "x": 3, "y": 0},
+        {"matrix": [1, 1], "x": 4, "y": 0},
+        {"matrix": [0, 2], "x": 5, "y": 0},
+
+        {"matrix": [1, 2], "x": 6.5, "y": 0},
+        {"matrix": [0, 3], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0},
+        {"matrix": [0, 4], "x": 9.5, "y": 0},
+
+        {"matrix": [1, 4], "x": 11, "y": 0},
+        {"matrix": [0, 5], "x": 12, "y": 0},
+        {"matrix": [1, 5], "x": 13, "y": 0},
+        {"matrix": [0, 6], "x": 14, "y": 0},
+
+        {"matrix": [1, 6], "x": 15.25, "y": 0},
+        {"matrix": [0, 7], "x": 16.25, "y": 0},
+        {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+        {"matrix": [2, 0], "x": 0, "y": 1.5},
+        {"matrix": [3, 0], "x": 1, "y": 1.5},
+        {"matrix": [2, 1], "x": 2, "y": 1.5},
+        {"matrix": [3, 1], "x": 3, "y": 1.5},
+        {"matrix": [2, 2], "x": 4, "y": 1.5},
+        {"matrix": [3, 2], "x": 5, "y": 1.5},
+        {"matrix": [2, 3], "x": 6, "y": 1.5},
+        {"matrix": [3, 3], "x": 7, "y": 1.5},
+        {"matrix": [2, 4], "x": 8, "y": 1.5},
+        {"matrix": [3, 4], "x": 9, "y": 1.5},
+        {"matrix": [2, 5], "x": 10, "y": 1.5},
+        {"matrix": [3, 5], "x": 11, "y": 1.5},
+        {"matrix": [2, 6], "x": 12, "y": 1.5},
+        {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+        {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+
+        {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+        {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+        {"matrix": [3, 8], "x": 18.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 19.5, "y": 1.5},
+        {"matrix": [3, 9], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 9], "x": 21.5, "y": 1.5},
+
+        {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+        {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+        {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+        {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+        {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+        {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+        {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+        {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 8], "x": 18.5, "y": 2.5},
+        {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 9], "x": 20.5, "y": 2.5},
+        {"matrix": [1, 9], "x": 21.5, "y": 2.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+        {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+        {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+        {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+        {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+        {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+        {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+        {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [6, 8], "x": 18.5, "y": 3.5},
+        {"matrix": [7, 8], "x": 19.5, "y": 3.5},
+        {"matrix": [6, 9], "x": 20.5, "y": 3.5},
+        {"matrix": [7, 9], "x": 21.5, "y": 3.5},
+
+        {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [11, 1], "x": 1.25, "y": 4.5},
+        {"matrix": [9, 0], "x": 2.25, "y": 4.5},
+        {"matrix": [8, 1], "x": 3.25, "y": 4.5},
+        {"matrix": [9, 1], "x": 4.25, "y": 4.5},
+        {"matrix": [8, 2], "x": 5.25, "y": 4.5},
+        {"matrix": [9, 2], "x": 6.25, "y": 4.5},
+        {"matrix": [8, 3], "x": 7.25, "y": 4.5},
+        {"matrix": [9, 3], "x": 8.25, "y": 4.5},
+        {"matrix": [8, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [9, 4], "x": 10.25, "y": 4.5},
+        {"matrix": [8, 5], "x": 11.25, "y": 4.5},
+        {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.75},
+        {"matrix": [8, 6], "x": 14, "y": 4.5},
+
+        {"matrix": [8, 7], "x": 16.25, "y": 4.5},
+
+        {"matrix": [8, 8], "x": 18.5, "y": 4.5},
+        {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+        {"matrix": [8, 9], "x": 20.5, "y": 4.5},
+        {"matrix": [9, 9], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [11, 2], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+        {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+        {"matrix": [10, 8], "x": 17.25, "y": 5.5},
+
+        {"matrix": [11, 8], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [10, 9], "x": 20.5, "y": 5.5}
       ]
     }
   }
diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json
index 0e29960d94..d6779e758d 100644
--- a/keyboards/viktus/omnikey_bh/info.json
+++ b/keyboards/viktus/omnikey_bh/info.json
@@ -17,7 +17,136 @@
   "bootloader": "halfkay",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2.5, "y":0}, {"label":"K003", "x":4.5, "y":0}, {"label":"K004", "x":5.5, "y":0}, {"label":"K005", "x":6.5, "y":0}, {"label":"K006", "x":7.5, "y":0}, {"label":"K007", "x":9, "y":0}, {"label":"K008", "x":10, "y":0}, {"label":"K009", "x":11, "y":0}, {"label":"K010", "x":12, "y":0}, {"label":"K011", "x":13.5, "y":0}, {"label":"K012", "x":14.5, "y":0}, {"label":"K013", "x":15.5, "y":0}, {"label":"K014", "x":16.5, "y":0}, {"label":"K015", "x":18, "y":0}, {"label":"K016", "x":19, "y":0}, {"label":"K017", "x":20, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2.5, "y":1.5}, {"label":"K103", "x":3.5, "y":1.5}, {"label":"K104", "x":4.5, "y":1.5}, {"label":"K105", "x":5.5, "y":1.5}, {"label":"K106", "x":6.5, "y":1.5}, {"label":"K107", "x":7.5, "y":1.5}, {"label":"K108", "x":8.5, "y":1.5}, {"label":"K109", "x":9.5, "y":1.5}, {"label":"K110", "x":10.5, "y":1.5}, {"label":"K111", "x":11.5, "y":1.5}, {"label":"K112", "x":12.5, "y":1.5}, {"label":"K113", "x":13.5, "y":1.5}, {"label":"K114", "x":14.5, "y":1.5}, {"label":"K115", "x":15.5, "y":1.5, "w":2}, {"label":"K116", "x":18, "y":1.5}, {"label":"K117", "x":19, "y":1.5}, {"label":"K118", "x":20, "y":1.5}, {"label":"K119", "x":21.5, "y":1.5}, {"label":"K120", "x":22.5, "y":1.5}, {"label":"K121", "x":23.5, "y":1.5}, {"label":"K122", "x":24.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5}, {"label":"K201", "x":1, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5, "w":1.5}, {"label":"K203", "x":4, "y":2.5}, {"label":"K204", "x":5, "y":2.5}, {"label":"K205", "x":6, "y":2.5}, {"label":"K206", "x":7, "y":2.5}, {"label":"K207", "x":8, "y":2.5}, {"label":"K208", "x":9, "y":2.5}, {"label":"K209", "x":10, "y":2.5}, {"label":"K210", "x":11, "y":2.5}, {"label":"K211", "x":12, "y":2.5}, {"label":"K212", "x":13, "y":2.5}, {"label":"K213", "x":14, "y":2.5}, {"label":"K214", "x":15, "y":2.5}, {"label":"K215", "x":16, "y":2.5, "w":1.5}, {"label":"K216", "x":18, "y":2.5}, {"label":"K217", "x":19, "y":2.5}, {"label":"K218", "x":20, "y":2.5}, {"label":"K219", "x":21.5, "y":2.5}, {"label":"K220", "x":22.5, "y":2.5}, {"label":"K221", "x":23.5, "y":2.5}, {"label":"K222", "x":24.5, "y":2.5}, {"label":"K300", "x":0, "y":3.5}, {"label":"K301", "x":1, "y":3.5}, {"label":"K302", "x":2.5, "y":3.5, "w":1.75}, {"label":"K303", "x":4.25, "y":3.5}, {"label":"K304", "x":5.25, "y":3.5}, {"label":"K305", "x":6.25, "y":3.5}, {"label":"K306", "x":7.25, "y":3.5}, {"label":"K307", "x":8.25, "y":3.5}, {"label":"K308", "x":9.25, "y":3.5}, {"label":"K309", "x":10.25, "y":3.5}, {"label":"K310", "x":11.25, "y":3.5}, {"label":"K311", "x":12.25, "y":3.5}, {"label":"K312", "x":13.25, "y":3.5}, {"label":"K313", "x":14.25, "y":3.5}, {"label":"K314", "x":15.25, "y":3.5, "w":2.25}, {"label":"K315", "x":18, "y":3.5}, {"label":"K316", "x":19, "y":3.5}, {"label":"K317", "x":20, "y":3.5}, {"label":"K318", "x":21.5, "y":3.5}, {"label":"K319", "x":22.5, "y":3.5}, {"label":"K320", "x":23.5, "y":3.5}, {"label":"K321", "x":24.5, "y":3.5}, {"label":"K400", "x":0, "y":4.5}, {"label":"K401", "x":1, "y":4.5}, {"label":"K402", "x":2.5, "y":4.5, "w":2.25}, {"label":"K403", "x":4.75, "y":4.5}, {"label":"K404", "x":5.75, "y":4.5}, {"label":"K405", "x":6.75, "y":4.5}, {"label":"K406", "x":7.75, "y":4.5}, {"label":"K407", "x":8.75, "y":4.5}, {"label":"K408", "x":9.75, "y":4.5}, {"label":"K409", "x":10.75, "y":4.5}, {"label":"K410", "x":11.75, "y":4.5}, {"label":"K411", "x":12.75, "y":4.5}, {"label":"K412", "x":13.75, "y":4.5}, {"label":"K413", "x":14.75, "y":4.5, "w":1.75}, {"label":"K414", "x":16.5, "y":4.5}, {"label":"K415", "x":18, "y":4.5}, {"label":"K416", "x":19, "y":4.5}, {"label":"K417", "x":20, "y":4.5}, {"label":"K418", "x":21.5, "y":4.5}, {"label":"K419", "x":22.5, "y":4.5}, {"label":"K420", "x":23.5, "y":4.5}, {"label":"K421", "x":24.5, "y":4.5, "h":2}, {"label":"K500", "x":0, "y":5.5}, {"label":"K501", "x":1, "y":5.5}, {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, {"label":"K503", "x":4, "y":5.5}, {"label":"K504", "x":5, "y":5.5, "w":1.5}, {"label":"K507", "x":6.5, "y":5.5, "w":7}, {"label":"K512", "x":13.5, "y":5.5}, {"label":"K513", "x":14.5, "y":5.5}, {"label":"K514", "x":15.5, "y":5.5}, {"label":"K515", "x":16.5, "y":5.5}, {"label":"K516", "x":18, "y":5.5}, {"label":"K517", "x":19, "y":5.5}, {"label":"K518", "x":20, "y":5.5}, {"label":"K519", "x":21.5, "y":5.5, "w":2}, {"label":"K520", "x":23.5, "y":5.5}]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2.5, "y": 0},
+        {"matrix": [0, 3], "x": 4.5, "y": 0},
+        {"matrix": [0, 4], "x": 5.5, "y": 0},
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [0, 7], "x": 9, "y": 0},
+        {"matrix": [0, 8], "x": 10, "y": 0},
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0},
+        {"matrix": [0, 11], "x": 13.5, "y": 0},
+        {"matrix": [0, 12], "x": 14.5, "y": 0},
+        {"matrix": [0, 13], "x": 15.5, "y": 0},
+        {"matrix": [0, 14], "x": 16.5, "y": 0},
+        {"matrix": [0, 15], "x": 18, "y": 0},
+        {"matrix": [0, 16], "x": 19, "y": 0},
+        {"matrix": [0, 17], "x": 20, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2.5, "y": 1.5},
+        {"matrix": [1, 3], "x": 3.5, "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": [1, 11], "x": 11.5, "y": 1.5},
+        {"matrix": [1, 12], "x": 12.5, "y": 1.5},
+        {"matrix": [1, 13], "x": 13.5, "y": 1.5},
+        {"matrix": [1, 14], "x": 14.5, "y": 1.5},
+        {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2},
+        {"matrix": [1, 16], "x": 18, "y": 1.5},
+        {"matrix": [1, 17], "x": 19, "y": 1.5},
+        {"matrix": [1, 18], "x": 20, "y": 1.5},
+        {"matrix": [1, 19], "x": 21.5, "y": 1.5},
+        {"matrix": [1, 20], "x": 22.5, "y": 1.5},
+        {"matrix": [1, 21], "x": 23.5, "y": 1.5},
+        {"matrix": [1, 22], "x": 24.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.5, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 3], "x": 4, "y": 2.5},
+        {"matrix": [2, 4], "x": 5, "y": 2.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": [2, 10], "x": 11, "y": 2.5},
+        {"matrix": [2, 11], "x": 12, "y": 2.5},
+        {"matrix": [2, 12], "x": 13, "y": 2.5},
+        {"matrix": [2, 13], "x": 14, "y": 2.5},
+        {"matrix": [2, 14], "x": 15, "y": 2.5},
+        {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 16], "x": 18, "y": 2.5},
+        {"matrix": [2, 17], "x": 19, "y": 2.5},
+        {"matrix": [2, 18], "x": 20, "y": 2.5},
+        {"matrix": [2, 19], "x": 21.5, "y": 2.5},
+        {"matrix": [2, 20], "x": 22.5, "y": 2.5},
+        {"matrix": [2, 21], "x": 23.5, "y": 2.5},
+        {"matrix": [2, 22], "x": 24.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.5, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 3], "x": 4.25, "y": 3.5},
+        {"matrix": [3, 4], "x": 5.25, "y": 3.5},
+        {"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": [3, 10], "x": 11.25, "y": 3.5},
+        {"matrix": [3, 11], "x": 12.25, "y": 3.5},
+        {"matrix": [3, 12], "x": 13.25, "y": 3.5},
+        {"matrix": [3, 13], "x": 14.25, "y": 3.5},
+        {"matrix": [3, 14], "x": 15.25, "y": 3.5, "w": 2.25},
+        {"matrix": [3, 15], "x": 18, "y": 3.5},
+        {"matrix": [3, 16], "x": 19, "y": 3.5},
+        {"matrix": [3, 17], "x": 20, "y": 3.5},
+        {"matrix": [3, 18], "x": 21.5, "y": 3.5},
+        {"matrix": [3, 19], "x": 22.5, "y": 3.5},
+        {"matrix": [3, 20], "x": 23.5, "y": 3.5},
+        {"matrix": [3, 21], "x": 24.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.5, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 3], "x": 4.75, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.75, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.75, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.75, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.75, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.75, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.75, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.75, "y": 4.5},
+        {"matrix": [4, 11], "x": 12.75, "y": 4.5},
+        {"matrix": [4, 12], "x": 13.75, "y": 4.5},
+        {"matrix": [4, 13], "x": 14.75, "y": 4.5, "w": 1.75},
+        {"matrix": [4, 14], "x": 16.5, "y": 4.5},
+        {"matrix": [4, 15], "x": 18, "y": 4.5},
+        {"matrix": [4, 16], "x": 19, "y": 4.5},
+        {"matrix": [4, 17], "x": 20, "y": 4.5},
+        {"matrix": [4, 18], "x": 21.5, "y": 4.5},
+        {"matrix": [4, 19], "x": 22.5, "y": 4.5},
+        {"matrix": [4, 20], "x": 23.5, "y": 4.5},
+        {"matrix": [4, 21], "x": 24.5, "y": 4.5, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5},
+        {"matrix": [5, 1], "x": 1, "y": 5.5},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 3], "x": 4, "y": 5.5},
+        {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.5},
+        {"matrix": [5, 7], "x": 6.5, "y": 5.5, "w": 7},
+        {"matrix": [5, 12], "x": 13.5, "y": 5.5},
+        {"matrix": [5, 13], "x": 14.5, "y": 5.5},
+        {"matrix": [5, 14], "x": 15.5, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+        {"matrix": [5, 16], "x": 18, "y": 5.5},
+        {"matrix": [5, 17], "x": 19, "y": 5.5},
+        {"matrix": [5, 18], "x": 20, "y": 5.5},
+        {"matrix": [5, 19], "x": 21.5, "y": 5.5, "w": 2},
+        {"matrix": [5, 20], "x": 23.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/viktus/omnikey_bh/omnikey_bh.h b/keyboards/viktus/omnikey_bh/omnikey_bh.h
deleted file mode 100644
index f36184f390..0000000000
--- a/keyboards/viktus/omnikey_bh/omnikey_bh.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017,                               \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, K121, K122, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, K221, K222, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319, K320, K321,       \
-  K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419, K420, K421,       \
-  K500, K501, K502, K503, K504,             K507,                         K512, K513, K514, K515, K516, K517, K518, K519, K520  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,   K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,   K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,  K120,  K121,  K122 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,   K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,  K220,  K221,  K222 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,   K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318,  K319,  K320,  K321,  KC_NO }, \
-  { K400,  K401,  K402,  K403,  K404,  K405,   K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414,  K415,  K416,  K417,  K418,  K419,  K420,  K421,  KC_NO }, \
-  { K500,  K501,  K502,  K503,  K504,  KC_NO,  KC_NO, K507,  KC_NO, KC_NO, KC_NO, KC_NO, K512,  K513,  K514,  K515,  K516,  K517,  K518,  K519,  K520,  KC_NO, KC_NO }  \
-}