Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 195 insertions, 203 deletions

diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/info.json
index f622120e9a..d55094022a 100644
--- a/keyboards/viktus/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/info.json
@@ -23,182 +23,205 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"Esc", "x":2.5, "y":0},
-                {"label":"!", "x":3.5, "y":0},
-                {"label":"@", "x":4.5, "y":0},
-                {"label":"#", "x":5.5, "y":0},
-                {"label":"$", "x":6.5, "y":0},
-                {"label":"%", "x":7.5, "y":0},
-                {"label":"^", "x":8.5, "y":0},
-                {"label":"&", "x":9.5, "y":0},
-                {"label":"*", "x":10.5, "y":0},
-                {"label":"(", "x":11.5, "y":0},
-                {"label":")", "x":12.5, "y":0},
-                {"label":"_", "x":13.5, "y":0},
-                {"label":"+", "x":14.5, "y":0},
-                {"label":"Backspace", "x":15.5, "y":0, "w":1.75},
-                {"label":"Num Lock", "x":17.25, "y":0},
-                {"label":"Scroll Lock", "x":18.25, "y":0, "w":1.5},
-                {"label":"Sys Req", "x":19.75, "y":0, "w":1.5},
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.5, "y":1, "w":1.5},
-                {"label":"Q", "x":4, "y":1},
-                {"label":"W", "x":5, "y":1},
-                {"label":"E", "x":6, "y":1},
-                {"label":"R", "x":7, "y":1},
-                {"label":"T", "x":8, "y":1},
-                {"label":"Y", "x":9, "y":1},
-                {"label":"U", "x":10, "y":1},
-                {"label":"I", "x":11, "y":1},
-                {"label":"O", "x":12, "y":1},
-                {"label":"P", "x":13, "y":1},
-                {"label":"{", "x":14, "y":1},
-                {"label":"}", "x":15, "y":1, "w":1.25},
-                {"label":"Enter", "x":15.25, "y":2, "w":2},
-                {"label":"7", "x":17.25, "y":1},
-                {"label":"8", "x":18.25, "y":1},
-                {"label":"9", "x":19.25, "y":1},
-                {"label":"PrtSc", "x":20.25, "y":1},
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Ctrl", "x":2.5, "y":2, "w":1.75},
-                {"label":"A", "x":4.25, "y":2},
-                {"label":"S", "x":5.25, "y":2},
-                {"label":"D", "x":6.25, "y":2},
-                {"label":"F", "x":7.25, "y":2},
-                {"label":"G", "x":8.25, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":":", "x":13.25, "y":2},
-                {"label":"\"", "x":14.25, "y":2},
-                {"label":"4", "x":17.25, "y":2},
-                {"label":"5", "x":18.25, "y":2},
-                {"label":"6", "x":19.25, "y":2},
-                {"label":"-", "x":20.25, "y":2},
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.5, "y":3, "w":2.25},
-                {"label":"Z", "x":4.75, "y":3},
-                {"label":"X", "x":5.75, "y":3},
-                {"label":"C", "x":6.75, "y":3},
-                {"label":"V", "x":7.75, "y":3},
-                {"label":"B", "x":8.75, "y":3},
-                {"label":"N", "x":9.75, "y":3},
-                {"label":"M", "x":10.75, "y":3},
-                {"label":"<", "x":11.75, "y":3},
-                {"label":">", "x":12.75, "y":3},
-                {"label":"?", "x":13.75, "y":3},
-                {"label":"Shift", "x":14.75, "y":3, "w":1.5},
-                {"label":"|", "x":16.25, "y":3},
-                {"label":"1", "x":17.25, "y":3},
-                {"label":"2", "x":18.25, "y":3},
-                {"label":"3", "x":19.25, "y":3},
-                {"label":"+", "x":20.25, "y":3, "h":2},
-                {"label":"F9", "x":0, "y":4},
-                {"label":"F10", "x":1, "y":4},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.75},
-                {"label":"~", "x":4.25, "y":4},
-                {"label":"Space", "x":5.25, "y":4, "w":9},
-                {"label":"Caps Lock", "x":14.25, "y":4, "w":2},
-                {"label":"0", "x":16.25, "y":4, "w":2},
-                {"label":".", "x":18.25, "y":4, "w":2}
+                {"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": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 1.75},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
+                {"matrix": [0, 17], "x": 18.25, "y": 0, "w": 1.5},
+                {"matrix": [0, 19], "x": 19.75, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 2, "w": 2},
+                {"matrix": [1, 16], "x": 17.25, "y": 1},
+                {"matrix": [1, 17], "x": 18.25, "y": 1},
+                {"matrix": [1, 18], "x": 19.25, "y": 1},
+                {"matrix": [1, 19], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 15], "x": 17.25, "y": 2},
+                {"matrix": [2, 16], "x": 18.25, "y": 2},
+                {"matrix": [2, 17], "x": 19.25, "y": 2},
+                {"matrix": [2, 18], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 3},
+                {"matrix": [3, 15], "x": 17.25, "y": 3},
+                {"matrix": [3, 16], "x": 18.25, "y": 3},
+                {"matrix": [3, 17], "x": 19.25, "y": 3},
+                {"matrix": [3, 18], "x": 20.25, "y": 3, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.75},
+                {"matrix": [4, 3], "x": 4.25, "y": 4},
+                {"matrix": [4, 7], "x": 5.25, "y": 4, "w": 9},
+                {"matrix": [4, 14], "x": 14.25, "y": 4, "w": 2},
+                {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 2},
+                {"matrix": [4, 17], "x": 18.25, "y": 4, "w": 2}
             ]
         },
         "LAYOUT_z150_tkl": {
             "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"F2", "x":1, "y":0},
-                {"label":"Esc", "x":2.5, "y":0},
-                {"label":"1", "x":3.5, "y":0},
-                {"label":"2", "x":4.5, "y":0},
-                {"label":"3", "x":5.5, "y":0},
-                {"label":"4", "x":6.5, "y":0},
-                {"label":"5", "x":7.5, "y":0},
-                {"label":"6", "x":8.5, "y":0},
-                {"label":"7", "x":9.5, "y":0},
-                {"label":"8", "x":10.5, "y":0},
-                {"label":"9", "x":11.5, "y":0},
-                {"label":"0", "x":12.5, "y":0},
-                {"label":"-", "x":13.5, "y":0},
-                {"label":"=", "x":14.5, "y":0},
-                {"label":"Backspace", "x":15.5, "y":0, "w":2},
-                {"label":"Insert", "x":18.25, "y":0},
-                {"label":"Home", "x":19.25, "y":0},
-                {"label":"PgUp", "x":20.25, "y":0},
-                {"label":"F3", "x":0, "y":1},
-                {"label":"F4", "x":1, "y":1},
-                {"label":"Tab", "x":2.5, "y":1, "w":1.5},
-                {"label":"Q", "x":4, "y":1},
-                {"label":"W", "x":5, "y":1},
-                {"label":"E", "x":6, "y":1},
-                {"label":"R", "x":7, "y":1},
-                {"label":"T", "x":8, "y":1},
-                {"label":"Y", "x":9, "y":1},
-                {"label":"U", "x":10, "y":1},
-                {"label":"I", "x":11, "y":1},
-                {"label":"O", "x":12, "y":1},
-                {"label":"P", "x":13, "y":1},
-                {"label":"[", "x":14, "y":1},
-                {"label":"]", "x":15, "y":1},
-                {"label":"\\", "x":16, "y":1, "w":1.5},
-                {"label":"Delete", "x":18.25, "y":1},
-                {"label":"End", "x":19.25, "y":1},
-                {"label":"PgDn", "x":20.25, "y":1},
-                {"label":"F5", "x":0, "y":2},
-                {"label":"F6", "x":1, "y":2},
-                {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75},
-                {"label":"A", "x":4.25, "y":2},
-                {"label":"S", "x":5.25, "y":2},
-                {"label":"D", "x":6.25, "y":2},
-                {"label":"F", "x":7.25, "y":2},
-                {"label":"G", "x":8.25, "y":2},
-                {"label":"H", "x":9.25, "y":2},
-                {"label":"J", "x":10.25, "y":2},
-                {"label":"K", "x":11.25, "y":2},
-                {"label":"L", "x":12.25, "y":2},
-                {"label":";", "x":13.25, "y":2},
-                {"label":"'", "x":14.25, "y":2},
-                {"label":"Enter", "x":15.25, "y":2, "w":2.25},
-                {"x":18.25, "y":2},
-                {"x":19.25, "y":2},
-                {"x":20.25, "y":2},
-                {"label":"F7", "x":0, "y":3},
-                {"label":"F8", "x":1, "y":3},
-                {"label":"Shift", "x":2.5, "y":3, "w":1.25},
-                {"label":"ISO \\", "x":3.75, "y":3},
-                {"label":"Z", "x":4.75, "y":3},
-                {"label":"X", "x":5.75, "y":3},
-                {"label":"C", "x":6.75, "y":3},
-                {"label":"V", "x":7.75, "y":3},
-                {"label":"B", "x":8.75, "y":3},
-                {"label":"N", "x":9.75, "y":3},
-                {"label":"M", "x":10.75, "y":3},
-                {"label":",", "x":11.75, "y":3},
-                {"label":".", "x":12.75, "y":3},
-                {"label":"/", "x":13.75, "y":3},
-                {"label":"Shift", "x":14.75, "y":3, "w":1.75},
-                {"label":"Fn", "x":16.5, "y":3},
-                {"x":18.25, "y":3},
-                {"label":"Up", "x":19.25, "y":3},
-                {"x":20.25, "y":3},
-                {"label":"F9", "x":0, "y":4},
-                {"label":"F10", "x":1, "y":4},
-                {"label":"Ctrl", "x":2.5, "y":4, "w":1.25},
-                {"label":"Win", "x":3.75, "y":4, "w":1.25},
-                {"label":"Alt", "x":5, "y":4, "w":1.25},
-                {"label":"Space", "x":6.25, "y":4, "w":6.25},
-                {"label":"Alt", "x":12.5, "y":4, "w":1.25},
-                {"label":"Win", "x":13.75, "y":4, "w":1.25},
-                {"label":"Menu", "x":15, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":16.25, "y":4, "w":1.25},
-                {"label":"Left", "x":18.25, "y":4},
-                {"label":"Down", "x":19.25, "y":4},
-                {"label":"Right", "x":20.25, "y":4}
+                {"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": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2},
+
+                {"matrix": [0, 17], "x": 18.25, "y": 0},
+                {"matrix": [0, 18], "x": 19.25, "y": 0},
+                {"matrix": [0, 19], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5},
+                {"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},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 17], "x": 18.25, "y": 1},
+                {"matrix": [1, 18], "x": 19.25, "y": 1},
+                {"matrix": [1, 19], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 16], "x": 18.25, "y": 2},
+                {"matrix": [2, 17], "x": 19.25, "y": 2},
+                {"matrix": [2, 18], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+                {"matrix": [3, 16], "x": 18.25, "y": 3},
+                {"matrix": [3, 17], "x": 19.25, "y": 3},
+                {"matrix": [3, 18], "x": 20.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 6.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 16], "x": 18.25, "y": 4},
+                {"matrix": [4, 17], "x": 19.25, "y": 4},
+                {"matrix": [4, 18], "x": 20.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/viktus/z150_bh/z150_bh.h b/keyboards/viktus/z150_bh/z150_bh.h
deleted file mode 100644
index f97ac1c035..0000000000
--- a/keyboards/viktus/z150_bh/z150_bh.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01,     K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,     K0G,   K0H, K0J,    \
-    K10, K11,     K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,     K1G, K1H, K1I, K1J, \
-    K20, K21,     K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               K2F, K2G, K2H, K2I, \
-    K30, K31,     K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,          K3F, K3G, K3H, K3I, \
-    K40, K41,     K42, K43,                K47,                                 K4E,          K4F,      K4H     \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H,   KC_NO, K0J   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G,   K1H,   K1I,   K1J   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO, K2F,   K2G,   K2H,   K2I,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K3G,   K3H,   K3I,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   KC_NO, KC_NO, KC_NO, K47,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K4E,   K4F,   KC_NO, K4H,   KC_NO, KC_NO }  \
-}
-
-#define LAYOUT_z150_tkl( \
-    K00, K01,     K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F,     K0H, K0I, K0J, \
-    K10, K11,     K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F,     K1H, K1I, K1J, \
-    K20, K21,     K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,          K2G, K2H, K2I, \
-    K30, K31,     K32, K45, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,     K3G, K3H, K3I, \
-    K40, K41,     K42, K43, K44,                K47,                K4C, K4D, K4E, K4F,     K4G, K4H, K4I  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   KC_NO, K0H,   K0I,   K0J   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   KC_NO, K1H,   K1I,   K1J   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   KC_NO, K2G,   K2H,   K2I,   KC_NO }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   KC_NO, K3G,   K3H,   K3I,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO, K47,   KC_NO, KC_NO, KC_NO, KC_NO, K4C,   K4D,   K4E,   K4F,   K4G,   K4H,   K4I,   KC_NO }  \
-}