Move `default` layouts to data driven (#20349)

2 files changed, 548 insertions, 629 deletions

diff --git a/keyboards/function96/v2/info.json b/keyboards/function96/v2/info.json
index 8dd0f575c7..88d54b5147 100644
--- a/keyboards/function96/v2/info.json
+++ b/keyboards/function96/v2/info.json
@@ -18,547 +18,570 @@
     "layouts": {
         "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":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":3, "w":1.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_default": {
             "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":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"6.25Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_ansi_splitspace": {
             "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":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "|", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "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":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"6.25Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "6.25Space", "matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_iso_splitspace": {
             "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":"Del", "x":14, "y":0},
-                {"label":"Prev", "x":15, "y":0},
-                {"label":"Next", "x":16, "y":0},
-                {"label":"Vol -", "x":17, "y":0},
-                {"label":"Vol +", "x":18, "y":0},
-
-                {"label":"\u00ac", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"\"", "x":2, "y":1},
-                {"label":"\u00a3", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Play", "x":15, "y":1},
-                {"label":"/", "x":16, "y":1},
-                {"label":"*", "x":17, "y":1},
-                {"label":"-", "x":18, "y":1},
-
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"7", "x":15, "y":2},
-                {"label":"8", "x":16, "y":2},
-                {"label":"9", "x":17, "y":2},
-
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"4", "x":15, "y":3},
-                {"label":"5", "x":16, "y":3},
-                {"label":"6", "x":17, "y":3},
-                {"label":"+", "x":18, "y":2, "h":2},
-
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"1", "x":15, "y":4},
-                {"label":"2", "x":16, "y":4},
-                {"label":"3", "x":17, "y":4},
-
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":2.25},
-                {"label":"Layer", "x":6, "y":5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":5, "w":2.75},
-                {"label":"Alt", "x":10, "y":5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5, "w":1.25},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5},
-                {"label":"0", "x":16, "y":5},
-                {"label":".", "x":17, "y":5},
-                {"label":"Enter", "x":18, "y":4, "h":2}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"label": "F5", "matrix": [0, 6], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [0, 9], "x": 8.5, "y": 0},
+
+                {"label": "F9", "matrix": [0, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [0, 11], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [0, 12], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [0, 13], "x": 12.75, "y": 0},
+
+                {"label": "Del", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "Prev", "matrix": [0, 15], "x": 15, "y": 0},
+                {"label": "Next", "matrix": [0, 16], "x": 16, "y": 0},
+                {"label": "Vol -", "matrix": [0, 17], "x": 17, "y": 0},
+                {"label": "Vol +", "matrix": [0, 18], "x": 18, "y": 0},
+
+                {"label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "!", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "\"", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "$", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "%", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "^", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "&", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "*", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "(", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ")", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "_", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "+", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "Backspace", "matrix": [1, 14], "x": 13, "y": 1, "w": 2},
+                {"label": "Play", "matrix": [1, 15], "x": 15, "y": 1},
+                {"label": "/", "matrix": [1, 16], "x": 16, "y": 1},
+                {"label": "*", "matrix": [1, 17], "x": 17, "y": 1},
+                {"label": "-", "matrix": [1, 18], "x": 18, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "matrix": [2, 2], "x": 1.5, "y": 2},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 2},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 2},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 2},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 2},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 2},
+                {"label": "I", "matrix": [2, 9], "x": 8.5, "y": 2},
+                {"label": "O", "matrix": [2, 10], "x": 9.5, "y": 2},
+                {"label": "P", "matrix": [2, 11], "x": 10.5, "y": 2},
+                {"label": "{", "matrix": [2, 12], "x": 11.5, "y": 2},
+                {"label": "}", "matrix": [2, 13], "x": 12.5, "y": 2},
+                {"label": "7", "matrix": [2, 15], "x": 15, "y": 2},
+                {"label": "8", "matrix": [2, 16], "x": 16, "y": 2},
+                {"label": "9", "matrix": [2, 17], "x": 17, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 1.75, "y": 3},
+                {"label": "S", "matrix": [3, 3], "x": 2.75, "y": 3},
+                {"label": "D", "matrix": [3, 4], "x": 3.75, "y": 3},
+                {"label": "F", "matrix": [3, 5], "x": 4.75, "y": 3},
+                {"label": "G", "matrix": [3, 6], "x": 5.75, "y": 3},
+                {"label": "H", "matrix": [3, 7], "x": 6.75, "y": 3},
+                {"label": "J", "matrix": [3, 8], "x": 7.75, "y": 3},
+                {"label": "K", "matrix": [3, 9], "x": 8.75, "y": 3},
+                {"label": "L", "matrix": [3, 10], "x": 9.75, "y": 3},
+                {"label": ":", "matrix": [3, 11], "x": 10.75, "y": 3},
+                {"label": "@", "matrix": [3, 12], "x": 11.75, "y": 3},
+                {"label": "~", "matrix": [3, 13], "x": 12.75, "y": 3},
+                {"label": "Enter", "matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "4", "matrix": [3, 15], "x": 15, "y": 3},
+                {"label": "5", "matrix": [3, 16], "x": 16, "y": 3},
+                {"label": "6", "matrix": [3, 17], "x": 17, "y": 3},
+                {"label": "+", "matrix": [3, 18], "x": 18, "y": 2, "h": 2},
+
+                {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "matrix": [4, 1], "x": 1.25, "y": 4},
+                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4},
+                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4},
+                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4},
+                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4},
+                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4},
+                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4},
+                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4},
+                {"label": "<", "matrix": [4, 9], "x": 9.25, "y": 4},
+                {"label": ">", "matrix": [4, 10], "x": 10.25, "y": 4},
+                {"label": "?", "matrix": [4, 11], "x": 11.25, "y": 4},
+                {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "matrix": [4, 14], "x": 14, "y": 4},
+                {"label": "1", "matrix": [4, 15], "x": 15, "y": 4},
+                {"label": "2", "matrix": [4, 16], "x": 16, "y": 4},
+                {"label": "3", "matrix": [4, 17], "x": 17, "y": 4},
+
+                {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25},
+                {"label": "Layer", "matrix": [5, 6], "x": 6, "y": 5, "w": 1.25},
+                {"label": "Space", "matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75},
+                {"label": "Alt", "matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"label": "Win", "matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"label": "\u2190", "matrix": [5, 12], "x": 13, "y": 5},
+                {"label": "\u2193", "matrix": [5, 14], "x": 14, "y": 5},
+                {"label": "\u2192", "matrix": [5, 15], "x": 15, "y": 5},
+                {"label": "0", "matrix": [5, 16], "x": 16, "y": 5},
+                {"label": ".", "matrix": [5, 17], "x": 17, "y": 5},
+                {"label": "Enter", "matrix": [5, 18], "x": 18, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/function96/v2/v2.h b/keyboards/function96/v2/v2.h
deleted file mode 100644
index 4e93d99b35..0000000000
--- a/keyboards/function96/v2/v2.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* Copyright 2020 Matt3o
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#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_all( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318,\
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518 \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_default( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, K316, K317, K318,\
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,                   K506,                   K510, K511, K512,       K514, K515, K516, K517, K518\
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_ansi_splitspace( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, K316, K317, K318, \
-	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_iso( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,                   K506,                   K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}
-#define LAYOUT_iso_splitspace( \
-	K000, K001, K002, K003, K004,       K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, K116, K117, K118, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, K217,      \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417,      \
-	K500, K501, K502,       K504,       K506,       K508,       K510, K511, K512,       K514, K515, K516, K517, K518   \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115,  K116,  K117,  K118 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216,  K217,  KC_NO }, \
-	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  K315,  K316,  K317,  K318 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO, K414,  K415,  K416,  K417,  KC_NO }, \
-	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  KC_NO, K508,  KC_NO, K510,  K511,  K512,  KC_NO, K514,  K515,  K516,  K517,  K518 }  \
-}