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

3 files changed, 367 insertions, 391 deletions

diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index ee8c9313c9..d40c12b52d 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -46,332 +46,380 @@
     "layouts": {
         "LAYOUT_ansi": {
             "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":10, "y":0},
-                {"label":"F8", "x":11, "y":0},
-                {"label":"F9", "x":12.5, "y":0},
-                {"label":"F10", "x":13.5, "y":0},
-                {"label":"F11", "x":14.5, "y":0},
-                {"label":"F12", "x":15.5, "y":0},
-                {"label":"Prt Sc", "x":17.5, "y":0},
-                {"label":"Scr Lk", "x":18.5, "y":0},
-                {"label":"Pause", "x":19.5, "y":0},
-
-                {"label":"F13", "x":0, "y":1.25},
-                {"label":"~", "x":1.5, "y":1.25},
-                {"label":"!", "x":2.5, "y":1.25},
-                {"label":"@", "x":3.5, "y":1.25},
-                {"label":"#", "x":4.5, "y":1.25},
-                {"label":"$", "x":5.5, "y":1.25},
-                {"label":"%", "x":6.5, "y":1.25},
-                {"label":"^", "x":7.5, "y":1.25},
-
-                {"label":"&", "x":10, "y":1.25},
-                {"label":"*", "x":11, "y":1.25},
-                {"label":"(", "x":12, "y":1.25},
-                {"label":")", "x":13, "y":1.25},
-                {"label":"_", "x":14, "y":1.25},
-                {"label":"+", "x":15, "y":1.25},
-                {"label":"Del", "x":16, "y":1.25},
-                {"label":"Bksp", "x":17, "y":1.25},
-                {"label":"Ins", "x":18.5, "y":1.25},
-                {"label":"Pg Up", "x":19.5, "y":1.25},
-
-                {"label":"F14", "x":0, "y":2.25},
-                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3, "y":2.25},
-                {"label":"W", "x":4, "y":2.25},
-                {"label":"E", "x":5, "y":2.25},
-                {"label":"R", "x":6, "y":2.25},
-                {"label":"T", "x":7, "y":2.25},
-
-                {"label":"Y", "x":9.5, "y":2.25},
-                {"label":"U", "x":10.5, "y":2.25},
-                {"label":"I", "x":11.5, "y":2.25},
-                {"label":"O", "x":12.5, "y":2.25},
-                {"label":"P", "x":13.5, "y":2.25},
-                {"label":"{", "x":14.5, "y":2.25},
-                {"label":"}", "x":15.5, "y":2.25},
-                {"label":"|", "x":16.5, "y":2.25, "w":1.5},
-                {"label":"Del", "x":18.5, "y":2.25},
-                {"label":"Pg Dn", "x":19.5, "y":2.25},
-
-                {"label":"F15", "x":0, "y":3.25},
-                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":3.25},
-                {"label":"S", "x":4.25, "y":3.25},
-                {"label":"D", "x":5.25, "y":3.25},
-                {"label":"F", "x":6.25, "y":3.25},
-                {"label":"G", "x":7.25, "y":3.25},
-
-                {"label":"H", "x":9.75, "y":3.25},
-                {"label":"J", "x":10.75, "y":3.25},
-                {"label":"K", "x":11.75, "y":3.25},
-                {"label":"L", "x":12.75, "y":3.25},
-                {"label":":", "x":13.75, "y":3.25},
-                {"label":"\"", "x":14.75, "y":3.25},
-                {"label":"Enter", "x":15.75, "y":3.25, "w":2.25},
-                {"label":"Home", "x":18.5, "y":3.25},
-                {"label":"End", "x":19.5, "y":3.25},
-
-                {"label":"F16", "x":0, "y":4.25},
-                {"label":"Shift", "x":1.5, "y":4.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":4.25},
-                {"label":"X", "x":4.75, "y":4.25},
-                {"label":"C", "x":5.75, "y":4.25},
-                {"label":"V", "x":6.75, "y":4.25},
-                {"label":"B", "x":7.75, "y":4.25},
-                {"label":"N", "x":10.25, "y":4.25},
-                {"label":"M", "x":11.25, "y":4.25},
-                {"label":"<", "x":12.25, "y":4.25},
-                {"label":">", "x":13.25, "y":4.25},
-                {"label":"?", "x":14.25, "y":4.25},
-                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":18.5, "y":4.25},
-
-                {"label":"F17", "x":0, "y":5.25},
-                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.75, "y":5.25},
-                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":6.25, "y":5.25},
-                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
-                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":14.75, "y":5.25},
-                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":17.5, "y":5.25},
-                {"label":"Down", "x":18.5, "y":5.25},
-                {"label":"Right", "x":19.5, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 15.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
             ]
         },
         "LAYOUT_iso": {
             "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":10, "y":0},
-                {"label":"F8", "x":11, "y":0},
-                {"label":"F9", "x":12.5, "y":0},
-                {"label":"F10", "x":13.5, "y":0},
-                {"label":"F11", "x":14.5, "y":0},
-                {"label":"F12", "x":15.5, "y":0},
-                {"label":"Prt Sc", "x":17.5, "y":0},
-                {"label":"Scr Lk", "x":18.5, "y":0},
-                {"label":"Pause", "x":19.5, "y":0},
-
-                {"label":"F13", "x":0, "y":1.25},
-                {"label":"~", "x":1.5, "y":1.25},
-                {"label":"!", "x":2.5, "y":1.25},
-                {"label":"@", "x":3.5, "y":1.25},
-                {"label":"#", "x":4.5, "y":1.25},
-                {"label":"$", "x":5.5, "y":1.25},
-                {"label":"%", "x":6.5, "y":1.25},
-                {"label":"^", "x":7.5, "y":1.25},
-
-                {"label":"&", "x":10, "y":1.25},
-                {"label":"*", "x":11, "y":1.25},
-                {"label":"(", "x":12, "y":1.25},
-                {"label":")", "x":13, "y":1.25},
-                {"label":"_", "x":14, "y":1.25},
-                {"label":"+", "x":15, "y":1.25},
-                {"label":"Del", "x":16, "y":1.25},
-                {"label":"Bksp", "x":17, "y":1.25},
-                {"label":"Ins", "x":18.5, "y":1.25},
-                {"label":"Pg Up", "x":19.5, "y":1.25},
-
-                {"label":"F14", "x":0, "y":2.25},
-                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3, "y":2.25},
-                {"label":"W", "x":4, "y":2.25},
-                {"label":"E", "x":5, "y":2.25},
-                {"label":"R", "x":6, "y":2.25},
-                {"label":"T", "x":7, "y":2.25},
-
-                {"label":"Y", "x":9.5, "y":2.25},
-                {"label":"U", "x":10.5, "y":2.25},
-                {"label":"I", "x":11.5, "y":2.25},
-                {"label":"O", "x":12.5, "y":2.25},
-                {"label":"P", "x":13.5, "y":2.25},
-                {"label":"{", "x":14.5, "y":2.25},
-                {"label":"}", "x":15.5, "y":2.25},
-                {"label":"Del", "x":18.5, "y":2.25},
-                {"label":"Pg Dn", "x":19.5, "y":2.25},
-
-                {"label":"F15", "x":0, "y":3.25},
-                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":3.25},
-                {"label":"S", "x":4.25, "y":3.25},
-                {"label":"D", "x":5.25, "y":3.25},
-                {"label":"F", "x":6.25, "y":3.25},
-                {"label":"G", "x":7.25, "y":3.25},
-
-                {"label":"H", "x":9.75, "y":3.25},
-                {"label":"J", "x":10.75, "y":3.25},
-                {"label":"K", "x":11.75, "y":3.25},
-                {"label":"L", "x":12.75, "y":3.25},
-                {"label":":", "x":13.75, "y":3.25},
-                {"label":"\"", "x":14.75, "y":3.25},
-                {"label":"#", "x":15.75, "y":3.25},
-                {"label":"Enter", "x":16.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"Home", "x":18.5, "y":3.25},
-                {"label":"End", "x":19.5, "y":3.25},
-
-                {"label":"F16", "x":0, "y":4.25},
-                {"label":"Shift", "x":1.5, "y":4.25, "w":1.25},
-                {"label":"\\", "x":2.75, "y":4.25},
-                {"label":"Z", "x":3.75, "y":4.25},
-                {"label":"X", "x":4.75, "y":4.25},
-                {"label":"C", "x":5.75, "y":4.25},
-                {"label":"V", "x":6.75, "y":4.25},
-                {"label":"B", "x":7.75, "y":4.25},
-                {"label":"N", "x":10.25, "y":4.25},
-                {"label":"M", "x":11.25, "y":4.25},
-                {"label":"<", "x":12.25, "y":4.25},
-                {"label":">", "x":13.25, "y":4.25},
-                {"label":"?", "x":14.25, "y":4.25},
-                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":18.5, "y":4.25},
-
-                {"label":"F17", "x":0, "y":5.25},
-                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.75, "y":5.25},
-                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":6.25, "y":5.25},
-                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
-                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":14.75, "y":5.25},
-                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":17.5, "y":5.25},
-                {"label":"Down", "x":18.5, "y":5.25},
-                {"label":"Right", "x":19.5, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 16.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
             ]
         },
         "LAYOUT_all": {
             "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":10, "y":0},
-                {"label":"F8", "x":11, "y":0},
-                {"label":"F9", "x":12.5, "y":0},
-                {"label":"F10", "x":13.5, "y":0},
-                {"label":"F11", "x":14.5, "y":0},
-                {"label":"F12", "x":15.5, "y":0},
-                {"label":"Prt Sc", "x":17.5, "y":0},
-                {"label":"Scr Lk", "x":18.5, "y":0},
-                {"label":"Pause", "x":19.5, "y":0},
-
-                {"label":"F13", "x":0, "y":1.25},
-                {"label":"~", "x":1.5, "y":1.25},
-                {"label":"!", "x":2.5, "y":1.25},
-                {"label":"@", "x":3.5, "y":1.25},
-                {"label":"#", "x":4.5, "y":1.25},
-                {"label":"$", "x":5.5, "y":1.25},
-                {"label":"%", "x":6.5, "y":1.25},
-                {"label":"^", "x":7.5, "y":1.25},
-
-                {"label":"&", "x":10, "y":1.25},
-                {"label":"*", "x":11, "y":1.25},
-                {"label":"(", "x":12, "y":1.25},
-                {"label":")", "x":13, "y":1.25},
-                {"label":"_", "x":14, "y":1.25},
-                {"label":"+", "x":15, "y":1.25},
-                {"label":"Del", "x":16, "y":1.25},
-                {"label":"Bksp", "x":17, "y":1.25},
-                {"label":"Ins", "x":18.5, "y":1.25},
-                {"label":"Pg Up", "x":19.5, "y":1.25},
-
-                {"label":"F14", "x":0, "y":2.25},
-                {"label":"Tab", "x":1.5, "y":2.25, "w":1.5},
-                {"label":"Q", "x":3, "y":2.25},
-                {"label":"W", "x":4, "y":2.25},
-                {"label":"E", "x":5, "y":2.25},
-                {"label":"R", "x":6, "y":2.25},
-                {"label":"T", "x":7, "y":2.25},
-
-                {"label":"Y", "x":9.5, "y":2.25},
-                {"label":"U", "x":10.5, "y":2.25},
-                {"label":"I", "x":11.5, "y":2.25},
-                {"label":"O", "x":12.5, "y":2.25},
-                {"label":"P", "x":13.5, "y":2.25},
-                {"label":"{", "x":14.5, "y":2.25},
-                {"label":"}", "x":15.5, "y":2.25},
-                {"label":"|", "x":16.5, "y":2.25, "w":1.5},
-                {"label":"Del", "x":18.5, "y":2.25},
-                {"label":"Pg Dn", "x":19.5, "y":2.25},
-
-                {"label":"F15", "x":0, "y":3.25},
-                {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":3.25},
-                {"label":"S", "x":4.25, "y":3.25},
-                {"label":"D", "x":5.25, "y":3.25},
-                {"label":"F", "x":6.25, "y":3.25},
-                {"label":"G", "x":7.25, "y":3.25},
-
-                {"label":"H", "x":9.75, "y":3.25},
-                {"label":"J", "x":10.75, "y":3.25},
-                {"label":"K", "x":11.75, "y":3.25},
-                {"label":"L", "x":12.75, "y":3.25},
-                {"label":":", "x":13.75, "y":3.25},
-                {"label":"\"", "x":14.75, "y":3.25},
-                {"label":"#", "x":15.75, "y":3.25},
-                {"label":"Enter", "x":16.75, "y":3.25, "w":1.25},
-                {"label":"Home", "x":18.5, "y":3.25},
-                {"label":"End", "x":19.5, "y":3.25},
-
-                {"label":"F16", "x":0, "y":4.25},
-                {"label":"Shift", "x":1.5, "y":4.25, "w":1.25},
-                {"label":"\\", "x":2.75, "y":4.25},
-                {"label":"Z", "x":3.75, "y":4.25},
-                {"label":"X", "x":4.75, "y":4.25},
-                {"label":"C", "x":5.75, "y":4.25},
-                {"label":"V", "x":6.75, "y":4.25},
-                {"label":"B", "x":7.75, "y":4.25},
-                {"label":"N", "x":10.25, "y":4.25},
-                {"label":"M", "x":11.25, "y":4.25},
-                {"label":"<", "x":12.25, "y":4.25},
-                {"label":">", "x":13.25, "y":4.25},
-                {"label":"?", "x":14.25, "y":4.25},
-                {"label":"Shift", "x":15.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":18.5, "y":4.25},
-
-                {"label":"F17", "x":0, "y":5.25},
-                {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":2.75, "y":5.25},
-                {"label":"Alt", "x":3.75, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":6.25, "y":5.25},
-                {"label":"Fn", "x":7.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":10, "y":5.25, "w":1.25},
-                {"label":"Space", "x":11.25, "y":5.25, "w":2.25},
-                {"label":"Alt", "x":13.5, "y":5.25, "w":1.25},
-                {"label":"Win", "x":14.75, "y":5.25},
-                {"label":"Ctrl", "x":15.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":17.5, "y":5.25},
-                {"label":"Down", "x":18.5, "y":5.25},
-                {"label":"Right", "x":19.5, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 0},
+
+                {"matrix": [5, 3], "x": 2, "y": 0},
+                {"matrix": [5, 4], "x": 3, "y": 0},
+                {"matrix": [5, 5], "x": 4, "y": 0},
+                {"matrix": [5, 6], "x": 5, "y": 0},
+
+                {"matrix": [5, 7], "x": 6.5, "y": 0},
+                {"matrix": [5, 8], "x": 7.5, "y": 0},
+
+                {"matrix": [11, 0], "x": 10, "y": 0},
+                {"matrix": [11, 1], "x": 11, "y": 0},
+
+                {"matrix": [11, 3], "x": 12.5, "y": 0},
+                {"matrix": [11, 4], "x": 13.5, "y": 0},
+                {"matrix": [11, 5], "x": 14.5, "y": 0},
+                {"matrix": [11, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [11, 7], "x": 17.5, "y": 0},
+                {"matrix": [11, 8], "x": 18.5, "y": 0},
+                {"matrix": [11, 9], "x": 19.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 1.5, "y": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 1.25},
+                {"matrix": [0, 4], "x": 3.5, "y": 1.25},
+                {"matrix": [0, 5], "x": 4.5, "y": 1.25},
+                {"matrix": [0, 6], "x": 5.5, "y": 1.25},
+                {"matrix": [0, 7], "x": 6.5, "y": 1.25},
+                {"matrix": [0, 8], "x": 7.5, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10, "y": 1.25},
+                {"matrix": [6, 1], "x": 11, "y": 1.25},
+                {"matrix": [6, 2], "x": 12, "y": 1.25},
+                {"matrix": [6, 3], "x": 13, "y": 1.25},
+                {"matrix": [6, 4], "x": 14, "y": 1.25},
+                {"matrix": [6, 5], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+                {"matrix": [6, 7], "x": 17, "y": 1.25},
+
+                {"matrix": [6, 8], "x": 18.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 2.25},
+                {"matrix": [1, 4], "x": 4, "y": 2.25},
+                {"matrix": [1, 5], "x": 5, "y": 2.25},
+                {"matrix": [1, 6], "x": 6, "y": 2.25},
+                {"matrix": [1, 7], "x": 7, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 8], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 13.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 14.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 15.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 16.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 8], "x": 18.5, "y": 3.25},
+                {"matrix": [8, 9], "x": 19.5, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [3, 2], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 4.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 4.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 4.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 4.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 4.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.25, "y": 4.25, "w": 1.75},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 5.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 13.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 14.75, "y": 5.25},
+                {"matrix": [10, 6], "x": 15.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 17.5, "y": 5.25},
+                {"matrix": [10, 8], "x": 18.5, "y": 5.25},
+                {"matrix": [10, 9], "x": 19.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index f0f4ae730d..45443becbe 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "quantum.h"
 #include "split_util.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.h b/keyboards/keebio/kbo5000/rev1/rev1.h
deleted file mode 100644
index 56d827871c..0000000000
--- a/keyboards/keebio/kbo5000/rev1/rev1.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ansi( \
-  LF1,      LF4, LF5, LF6, LF7, LF8, LF9,      RF1, RF2,      RF4, RF5, RF6, RF7, RF8, RF9, RF10, \
-  LA1, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10, \
-  LB1, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, RB10, \
-  LC1, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, RC10, \
-  LD1, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7,      RD9, \
-  LE1, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4,           RE7, RE8, RE9, RE10 \
-  ) \
-  { \
-    { LA1, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9, KC_NO }, \
-    { LB1, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO, KC_NO }, \
-    { LC1, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO, KC_NO }, \
-    { LD1, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9, KC_NO }, \
-    { LE1, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO, KC_NO }, \
-    { LF1, KC_NO, KC_NO, LF4, LF5, LF6, LF7, LF8, LF9, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, RB10 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9, RC10 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, KC_NO, RD9, KC_NO }, \
-    { RE1, RE2, RE3, RE4, KC_NO, KC_NO, RE7, RE8, RE9, RE10 }, \
-    { RF1, RF2, KC_NO, RF4, RF5, RF6, RF7, RF8, RF9, RF10 } \
-  }
-
-#define LAYOUT_iso( \
-  LF1,      LF4, LF5, LF6, LF7, LF8, LF9,      RF1, RF2,      RF4, RF5, RF6, RF7, RF8, RF9, RF10, \
-  LA1, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10, \
-  LB1, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, RB10, \
-  LC1, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10, \
-  LD1, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7,      RD9, \
-  LE1, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4,           RE7, RE8, RE9, RE10 \
-  ) \
-  { \
-    { LA1, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9, KC_NO }, \
-    { LB1, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO, KC_NO }, \
-    { LC1, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO, KC_NO }, \
-    { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9, KC_NO }, \
-    { LE1, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO, KC_NO }, \
-    { LF1, KC_NO, KC_NO, LF4, LF5, LF6, LF7, LF8, LF9, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9, RB10 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, KC_NO, RD9, KC_NO }, \
-    { RE1, RE2, RE3, RE4, KC_NO, KC_NO, RE7, RE8, RE9, RE10 }, \
-    { RF1, RF2, KC_NO, RF4, RF5, RF6, RF7, RF8, RF9, RF10 } \
-  }
-
-#define LAYOUT_all( \
-  LF1,      LF4, LF5, LF6, LF7, LF8, LF9,      RF1, RF2,      RF4, RF5, RF6, RF7, RF8, RF9, RF10, \
-  LA1, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10, \
-  LB1, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, RB10, \
-  LC1, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10, \
-  LD1, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7,      RD9, \
-  LE1, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4,           RE7, RE8, RE9, RE10 \
-  ) \
-  { \
-    { LA1, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9, KC_NO }, \
-    { LB1, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO, KC_NO }, \
-    { LC1, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO, KC_NO }, \
-    { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9, KC_NO }, \
-    { LE1, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO, KC_NO }, \
-    { LF1, KC_NO, KC_NO, LF4, LF5, LF6, LF7, LF8, LF9, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, RA10 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, RB10 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, KC_NO, RD9, KC_NO }, \
-    { RE1, RE2, RE3, RE4, KC_NO, KC_NO, RE7, RE8, RE9, RE10 }, \
-    { RF1, RF2, KC_NO, RF4, RF5, RF6, RF7, RF8, RF9, RF10 } \
-  }