Move miscellaneous layouts to data driven (#20516)

3 files changed, 197 insertions, 235 deletions

diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json
index 270da1ea50..94400c2907 100644
--- a/keyboards/io_mini1800/info.json
+++ b/keyboards/io_mini1800/info.json
@@ -23,189 +23,207 @@
     "layouts": {
         "LAYOUT_625u": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Ins", "x":15.25, "y":0},
-                {"label":"Home", "x":16.25, "y":0},
-                {"label":"Num Lock", "x":17.5, "y":0},
-                {"label":"/", "x":18.5, "y":0},
-                {"label":"*", "x":19.5, "y":0},
-                {"label":"-", "x":20.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15.25, "y":1},
-                {"label":"Del", "x":16.25, "y":1},
-                {"label":"7", "x":17.5, "y":1},
-                {"label":"8", "x":18.5, "y":1},
-                {"label":"9", "x":19.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"4", "x":17.5, "y":2},
-                {"label":"5", "x":18.5, "y":2},
-                {"label":"6", "x":19.5, "y":2},
-                {"label":"+", "x":20.5, "y":1, "h":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-                {"label":"Up", "x":15.75, "y":3.5},
-                {"label":"1", "x":17.5, "y":3},
-                {"label":"2", "x":18.5, "y":3},
-                {"label":"3", "x":19.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.5},
-                {"label":"Win", "x":11.5, "y":4, "w":1.25},
-                {"label":"Fn", "x":12.75, "y":4, "w":1.25},
-                {"label":"Left", "x":14.75, "y":4.5},
-                {"label":"Down", "x":15.75, "y":4.5},
-                {"label":"Right", "x":16.75, "y":4.5},
-                {"label":"0", "x":18.5, "y":4},
-                {"label":".", "x":19.5, "y":4},
-                {"label":"Enter", "x":20.5, "y":3, "h":2}
+                {"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, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [5, 9], "x": 10, "y": 0},
+                {"matrix": [5, 8], "x": 11, "y": 0},
+                {"matrix": [5, 7], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 4], "x": 16.25, "y": 0},
+
+                {"matrix": [5, 3], "x": 17.5, "y": 0},
+                {"matrix": [5, 2], "x": 18.5, "y": 0},
+                {"matrix": [5, 1], "x": 19.5, "y": 0},
+                {"matrix": [5, 0], "x": 20.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [6, 9], "x": 10.5, "y": 1},
+                {"matrix": [6, 8], "x": 11.5, "y": 1},
+                {"matrix": [6, 7], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 5], "x": 15.25, "y": 1},
+                {"matrix": [6, 4], "x": 16.25, "y": 1},
+
+                {"matrix": [6, 3], "x": 17.5, "y": 1},
+                {"matrix": [6, 2], "x": 18.5, "y": 1},
+                {"matrix": [6, 1], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [7, 9], "x": 10.75, "y": 2},
+                {"matrix": [7, 8], "x": 11.75, "y": 2},
+                {"matrix": [7, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 3], "x": 17.5, "y": 2},
+                {"matrix": [7, 2], "x": 18.5, "y": 2},
+                {"matrix": [7, 1], "x": 19.5, "y": 2},
+                {"matrix": [7, 0], "x": 20.5, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [8, 9], "x": 11.25, "y": 3},
+                {"matrix": [8, 8], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 5], "x": 15.75, "y": 3.5},
+
+                {"matrix": [8, 3], "x": 17.5, "y": 3},
+                {"matrix": [8, 2], "x": 18.5, "y": 3},
+                {"matrix": [8, 1], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [9, 9], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 8], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 14.75, "y": 4.5},
+                {"matrix": [9, 5], "x": 15.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 16.75, "y": 4.5},
+
+                {"matrix": [9, 2], "x": 18.5, "y": 4},
+                {"matrix": [9, 1], "x": 19.5, "y": 4},
+                {"matrix": [9, 0], "x": 20.5, "y": 3, "h": 2}
             ]
         },
         "LAYOUT_2x3u": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"!", "x":1, "y":0},
-                {"label":"@", "x":2, "y":0},
-                {"label":"#", "x":3, "y":0},
-                {"label":"$", "x":4, "y":0},
-                {"label":"%", "x":5, "y":0},
-                {"label":"^", "x":6, "y":0},
-                {"label":"&", "x":7, "y":0},
-                {"label":"*", "x":8, "y":0},
-                {"label":"(", "x":9, "y":0},
-                {"label":")", "x":10, "y":0},
-                {"label":"_", "x":11, "y":0},
-                {"label":"+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Ins", "x":15.25, "y":0},
-                {"label":"Home", "x":16.25, "y":0},
-                {"label":"Num Lock", "x":17.5, "y":0},
-                {"label":"/", "x":18.5, "y":0},
-                {"label":"*", "x":19.5, "y":0},
-                {"label":"-", "x":20.5, "y":0},
-
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"{", "x":11.5, "y":1},
-                {"label":"}", "x":12.5, "y":1},
-                {"label":"|", "x":13.5, "y":1, "w":1.5},
-                {"label":"End", "x":15.25, "y":1},
-                {"label":"Del", "x":16.25, "y":1},
-                {"label":"7", "x":17.5, "y":1},
-                {"label":"8", "x":18.5, "y":1},
-                {"label":"9", "x":19.5, "y":1},
-
-                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":":", "x":10.75, "y":2},
-                {"label":"\"", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"4", "x":17.5, "y":2},
-                {"label":"5", "x":18.5, "y":2},
-                {"label":"6", "x":19.5, "y":2},
-                {"label":"+", "x":20.5, "y":1, "h":2},
-
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":"<", "x":9.25, "y":3},
-                {"label":">", "x":10.25, "y":3},
-                {"label":"?", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-                {"label":"Up", "x":15.75, "y":3.5},
-                {"label":"1", "x":17.5, "y":3},
-                {"label":"2", "x":18.5, "y":3},
-                {"label":"3", "x":19.5, "y":3},
-
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":3},
-                {"x":6.75, "y":4, "w":3},
-                {"label":"Alt", "x":9.75, "y":4, "w":1.5},
-                {"label":"Win", "x":11.25, "y":4, "w":1.5},
-                {"label":"Fn", "x":12.75, "y":4, "w":1.25},
-                {"label":"Left", "x":14.75, "y":4.5},
-                {"label":"Down", "x":15.75, "y":4.5},
-                {"label":"Right", "x":16.75, "y":4.5},
-                {"label":"0", "x":18.5, "y":4},
-                {"label":".", "x":19.5, "y":4},
-                {"label":"Enter", "x":20.5, "y":3, "h":2}
+                {"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, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [5, 9], "x": 10, "y": 0},
+                {"matrix": [5, 8], "x": 11, "y": 0},
+                {"matrix": [5, 7], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [5, 5], "x": 15.25, "y": 0},
+                {"matrix": [5, 4], "x": 16.25, "y": 0},
+
+                {"matrix": [5, 3], "x": 17.5, "y": 0},
+                {"matrix": [5, 2], "x": 18.5, "y": 0},
+                {"matrix": [5, 1], "x": 19.5, "y": 0},
+                {"matrix": [5, 0], "x": 20.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [6, 9], "x": 10.5, "y": 1},
+                {"matrix": [6, 8], "x": 11.5, "y": 1},
+                {"matrix": [6, 7], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [6, 5], "x": 15.25, "y": 1},
+                {"matrix": [6, 4], "x": 16.25, "y": 1},
+
+                {"matrix": [6, 3], "x": 17.5, "y": 1},
+                {"matrix": [6, 2], "x": 18.5, "y": 1},
+                {"matrix": [6, 1], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [7, 9], "x": 10.75, "y": 2},
+                {"matrix": [7, 8], "x": 11.75, "y": 2},
+                {"matrix": [7, 7], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [7, 3], "x": 17.5, "y": 2},
+                {"matrix": [7, 2], "x": 18.5, "y": 2},
+                {"matrix": [7, 1], "x": 19.5, "y": 2},
+                {"matrix": [7, 0], "x": 20.5, "y": 1, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [8, 9], "x": 11.25, "y": 3},
+                {"matrix": [8, 8], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 5], "x": 15.75, "y": 3.5},
+
+                {"matrix": [8, 3], "x": 17.5, "y": 3},
+                {"matrix": [8, 2], "x": 18.5, "y": 3},
+                {"matrix": [8, 1], "x": 19.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 3},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 3},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 9], "x": 11.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 8], "x": 12.75, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 14.75, "y": 4.5},
+                {"matrix": [9, 5], "x": 15.75, "y": 4.5},
+                {"matrix": [9, 4], "x": 16.75, "y": 4.5},
+
+                {"matrix": [9, 2], "x": 18.5, "y": 4},
+                {"matrix": [9, 1], "x": 19.5, "y": 4},
+                {"matrix": [9, 0], "x": 20.5, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/io_mini1800/io_mini1800.c b/keyboards/io_mini1800/io_mini1800.c
deleted file mode 100644
index 7f148a3927..0000000000
--- a/keyboards/io_mini1800/io_mini1800.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "io_mini1800.h"
diff --git a/keyboards/io_mini1800/io_mini1800.h b/keyboards/io_mini1800/io_mini1800.h
deleted file mode 100644
index 634592d62c..0000000000
--- a/keyboards/io_mini1800/io_mini1800.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 s8erdude (@jpuerto96)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* 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_2x3u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56,   k55, k54,     k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66,   k65, k64,     k63, k62, k61, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77,                      k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88,                k85,       k83, k82, k81, \
-    k40, k41, k42, k43,           k46,           k49, k99, k98,           k96, k95, k94,       k92, k91, k90 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
-    { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
-    { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
-}
-
-#define LAYOUT_625u( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56,   k55, k54,     k53, k52, k51, k50, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66,   k65, k64,     k63, k62, k61, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77,                      k73, k72, k71, k70, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88,                k85,       k83, k82, k81, \
-    k40, k41, k42,           k45,                k49, k99, k98,           k96, k95, k94,       k92, k91, k90 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
-    { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
-    { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
-    { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
-    { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
-}