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

2 files changed, 352 insertions, 397 deletions

diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index 217eebe92e..3fb10600ee 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -30,331 +30,366 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Extra Esc", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.5, "y":0},
-                {"label":"Pause", "x":16.5, "y":0},
-                {"label":"Insert", "x":17.5, "y":0},
-                {"label":"Home", "x":18.5, "y":0},
-
-                {"label":"`~", "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":"Num Lock", "x":15.5, "y":1.5},
-                {"label":"/", "x":16.5, "y":1.5},
-                {"label":"*", "x":17.5, "y":1.5},
-                {"label":"-", "x":18.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":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"7", "x":15.5, "y":2.5},
-                {"label":"8", "x":16.5, "y":2.5},
-                {"label":"9", "x":17.5, "y":2.5},
-                {"label":"+", "x":18.5, "y":2.5, "h":2},
-
-                {"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":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"4", "x":15.5, "y":3.5},
-                {"label":"5", "x":16.5, "y":3.5},
-                {"label":"6", "x":17.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
-                {"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":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":14.25, "y":4.75},
-                {"label":"1", "x":15.5, "y":4.5},
-                {"label":"2", "x":16.5, "y":4.5},
-                {"label":"3", "x":17.5, "y":4.5},
-                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
-
-                {"label":"Control", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.5, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":9.75, "y":5.5},
-                {"label":"Fn", "x":10.75, "y":5.5},
-                {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":13.25, "y":5.75},
-                {"label":"Down", "x":14.25, "y":5.75},
-                {"label":"Right", "x":15.25, "y":5.75},
-                {"label":"0", "x":16.5, "y":5.5},
-                {"label":".", "x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Extra Esc", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.5, "y":0},
-                {"label":"Pause", "x":16.5, "y":0},
-                {"label":"Insert", "x":17.5, "y":0},
-                {"label":"Home", "x":18.5, "y":0},
-
-                {"label":"`\u00ac", "x":0, "y":1.5},
-                {"label":"1!", "x":1, "y":1.5},
-                {"label":"2\"", "x":2, "y":1.5},
-                {"label":"3\u00a3", "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":"Num Lock", "x":15.5, "y":1.5},
-                {"label":"/", "x":16.5, "y":1.5},
-                {"label":"*", "x":17.5, "y":1.5},
-                {"label":"-", "x":18.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":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"7", "x":15.5, "y":2.5},
-                {"label":"8", "x":16.5, "y":2.5},
-                {"label":"9", "x":17.5, "y":2.5},
-                {"label":"+", "x":18.5, "y":2.5, "h":2},
-
-                {"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":";:", "x":10.75, "y":3.5},
-                {"label":"'@", "x":11.75, "y":3.5},
-                {"label":"#~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-                {"label":"4", "x":15.5, "y":3.5},
-                {"label":"5", "x":16.5, "y":3.5},
-                {"label":"6", "x":17.5, "y":3.5},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"\\|", "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":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":14.25, "y":4.75},
-                {"label":"1", "x":15.5, "y":4.5},
-                {"label":"2", "x":16.5, "y":4.5},
-                {"label":"3", "x":17.5, "y":4.5},
-                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
-
-                {"label":"Control", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.5, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":9.75, "y":5.5},
-                {"label":"Fn", "x":10.75, "y":5.5},
-                {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":13.25, "y":5.75},
-                {"label":"Down", "x":14.25, "y":5.75},
-                {"label":"Right", "x":15.25, "y":5.75},
-                {"label":"0", "x":16.5, "y":5.5},
-                {"label":".", "x":17.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 1], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 12.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Extra Esc", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.5, "y":0},
-                {"label":"Pause", "x":16.5, "y":0},
-                {"label":"Insert", "x":17.5, "y":0},
-                {"label":"Home", "x":18.5, "y":0},
-
-                {"label":"`~", "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":"Split Backspace (Left)", "x":13, "y":1.5},
-                {"label":"Split Backspace (Right)", "x":14, "y":1.5},
-                {"label":"Num Lock", "x":15.5, "y":1.5},
-                {"label":"/", "x":16.5, "y":1.5},
-                {"label":"*", "x":17.5, "y":1.5},
-                {"label":"-", "x":18.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":"[{", "x":11.5, "y":2.5},
-                {"label":"]}", "x":12.5, "y":2.5},
-                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"7", "x":15.5, "y":2.5},
-                {"label":"8", "x":16.5, "y":2.5},
-                {"label":"9", "x":17.5, "y":2.5},
-                {"label":"Split + (Top)", "x":18.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":";:", "x":10.75, "y":3.5},
-                {"label":"'\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"4", "x":15.5, "y":3.5},
-                {"label":"5", "x":16.5, "y":3.5},
-                {"label":"6", "x":17.5, "y":3.5},
-                {"label":"Split + (Bottom)", "x":18.5, "y":3.5},
-
-                {"label":"Shift", "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":",<", "x":9.25, "y":4.5},
-                {"label":".>", "x":10.25, "y":4.5},
-                {"label":"/?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
-                {"label":"Up", "x":14.25, "y":4.75},
-                {"label":"1", "x":15.5, "y":4.5},
-                {"label":"2", "x":16.5, "y":4.5},
-                {"label":"3", "x":17.5, "y":4.5},
-                {"label":"Split Enter (Top)", "x":18.5, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.5},
-                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.5, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":9.75, "y":5.5},
-                {"label":"Fn", "x":10.75, "y":5.5},
-                {"label":"Ctrl", "x":11.75, "y":5.5, "w":1.25},
-                {"label":"Left", "x":13.25, "y":5.75},
-                {"label":"Down", "x":14.25, "y":5.75},
-                {"label":"Right", "x":15.25, "y":5.75},
-                {"label":"0", "x":16.5, "y":5.5},
-                {"label":".", "x":17.5, "y":5.5},
-                {"label":"Split Enter (Bottom)", "x":18.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 1], "x": 6.5, "y": 0},
+                {"matrix": [6, 2], "x": 7.5, "y": 0},
+                {"matrix": [6, 3], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+                {"matrix": [7, 2], "x": 14, "y": 0},
+
+                {"matrix": [0, 9], "x": 15.5, "y": 0},
+                {"matrix": [0, 10], "x": 16.5, "y": 0},
+                {"matrix": [0, 11], "x": 17.5, "y": 0},
+                {"matrix": [0, 12], "x": 18.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [6, 4], "x": 5, "y": 1.5},
+                {"matrix": [6, 5], "x": 6, "y": 1.5},
+                {"matrix": [6, 6], "x": 7, "y": 1.5},
+                {"matrix": [6, 7], "x": 8, "y": 1.5},
+                {"matrix": [1, 5], "x": 9, "y": 1.5},
+                {"matrix": [1, 6], "x": 10, "y": 1.5},
+                {"matrix": [1, 7], "x": 11, "y": 1.5},
+                {"matrix": [1, 8], "x": 12, "y": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 1.5},
+                {"matrix": [7, 1], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 9], "x": 15.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 16.5, "y": 1.5},
+                {"matrix": [1, 11], "x": 17.5, "y": 1.5},
+                {"matrix": [1, 12], "x": 18.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [6, 8], "x": 5.5, "y": 2.5},
+                {"matrix": [6, 9], "x": 6.5, "y": 2.5},
+                {"matrix": [6, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 9], "x": 15.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 18.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 12], "x": 5.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 9], "x": 15.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 11], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 12.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [7, 4], "x": 14.25, "y": 4.75},
+
+                {"matrix": [4, 9], "x": 15.5, "y": 4.5},
+                {"matrix": [4, 10], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 11], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 9], "x": 3.5, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 5], "x": 9.75, "y": 5.5},
+                {"matrix": [5, 6], "x": 10.75, "y": 5.5},
+                {"matrix": [5, 7], "x": 11.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 13.25, "y": 5.75},
+                {"matrix": [5, 3], "x": 14.25, "y": 5.75},
+                {"matrix": [5, 4], "x": 15.25, "y": 5.75},
+
+                {"matrix": [5, 10], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h
index d3766eadba..33bebeb882 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.h
+++ b/keyboards/kbdfans/kbd19x/kbd19x.h
@@ -28,83 +28,3 @@ inline void kbd19x_sclk_led_off(void)   { writePinLow(LED_SCROLL_LOCK_PIN); }
 
 inline void kbd19x_nmlk_led_on(void)    { writePinHigh(LED_NUM_LOCK_PIN); }
 inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
-
-// readability
-#define XXX KC_NO
-
-/*
- *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┬───┐
- *              │00 ││01 │02 │03 │04 ││60 │61 │62 │63 ││05 │06 │07 │08 ││72 │ │09 │0A │0B │0C │
- *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐    ┌───────┐
- *              │10 │11 │12 │13 │14 │64 │65 │66 │67 │15 │16 │17 │18 │70 │71 │ │19 │1A │1B │1C │    │71     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤    └─┬─────┤                ┌───┐
- *              │20   │21 │22 │23 │24 │68 │69 │6a │6b │25 │26 │27 │28 │73   │ │29 │2A │2B │2C │      │     │                │   │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐38  │ ISO Enter      │2C │ 2u Plus
- *  LShift      │30    │31 │32 │33 │34 │6c │75 │76 │77 │35 │36 │37 │38      │ │39 │3A │3B │3C │   │73 │    │                │   │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘                ├───┤
- * │40      │   │40  │41 │42 │43 │44 │78 │79 │7a │7b │45 │46 │47 │48    │┌───┐│49 │4A │4B │4C │                             │   │
- * └────────┘   ├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│74 │└───┼───┼───┼───┤                             │4C │ 2u Enter
- *              │50  │51 │52  │59                      │55 │56 │57  │┌───┼───┼───┐│5A │5B │5C │                             │   │
- *              └────┴───┴────┴────────────────────────┴───┴───┴────┘│58 │53 │54 │└───┴───┴───┘                             └───┘
- *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐└───┴───┴───┘
- *              │50   │52   │59                         │55   │57   │ WKL
- *              └─────┴─────┴───────────────────────────┴─────┴─────┘
- */
-
-#define LAYOUT_all( \
-  k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08,   k72,  k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k70, k71,  k19, k1a, k1b, k1c, \
-  k20,  k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28,     k73,  k29, k2a, k2b, k2c, \
-  k30,    k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37,        k38,  k39, k3a, k3b, k3c, \
-  k40,  k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47, k48,    k74,   k49, k4a, k4b, k4c, \
-  k50,  k51, k52,                k59,            k55, k56, k57,   k58, k53, k54,   k5a, k5b, k5c  \
-)\
-{\
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\
-  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c},\
-  {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\
-  {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c},\
-  {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
-  {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
-}
-
-#define LAYOUT_ansi( \
-  k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08, k72,     k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18,    k71,     k19, k1a, k1b, k1c, \
-  k20,  k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28,   k73,     k29, k2a, k2b, k2c, \
-  k30,    k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37,      k38,     k39, k3a, k3b,      \
-  k40,      k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47,    k48,   k74,   k49, k4a, k4b, k4c, \
-  k50, k51, k52,                k59,            k55, k56, k57,     k58, k53, k54,   k5a, k5b       \
-)\
-{\
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\
-  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\
-  {k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\
-  {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\
-  {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
-  {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
-}
-
-#define LAYOUT_iso( \
-  k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08, k72,     k09, k0a, k0b, k0c, \
-  k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18,    k71,     k19, k1a, k1b, k1c, \
-  k20,  k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28,            k29, k2a, k2b, k2c, \
-  k30,    k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k73, k38,     k39, k3a, k3b,      \
-  k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47,    k48,   k74,   k49, k4a, k4b, k4c, \
-  k50, k51, k52,                k59,            k55, k56, k57,     k58, k53, k54,   k5a, k5b       \
-)\
-{\
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\
-  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\
-  {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\
-  {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\
-  {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
-  {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
-}