Move TKL layouts to data driven (#20337)

3 files changed, 699 insertions, 844 deletions

diff --git a/keyboards/nix_studio/oxalys80/info.json b/keyboards/nix_studio/oxalys80/info.json
index ae8c7cae00..5261b52e6c 100644
--- a/keyboards/nix_studio/oxalys80/info.json
+++ b/keyboards/nix_studio/oxalys80/info.json
@@ -27,672 +27,728 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                { "x":13, "y":1.5},
-                {"label":"Bksp", "x":14, "y":1.5},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"Shift", "x":0, "y":4.5, "w":1.25},
-                { "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},
-                { "x":14, "y":4.5},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                { "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5},
+                {"matrix": [6, 6], "x": 14, "y": 1.5},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [9, 6], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                { "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                { "x":4, "y":5.5, "w":7},
-                {"label":"Win", "x":11, "y":5.5, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                { "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Win", "x":1.5, "y":5.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Win", "x":11, "y":5.5, "w":1.5},
-                {"label":"Menu", "x":12.5, "y":5.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 0], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso_wkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"@", "x":2, "y":1.5},
-                {"label":"#", "x":3, "y":1.5},
-                {"label":"$", "x":4, "y":1.5},
-                {"label":"%", "x":5, "y":1.5},
-                {"label":"^", "x":6, "y":1.5},
-                {"label":"&", "x":7, "y":1.5},
-                {"label":"*", "x":8, "y":1.5},
-                {"label":"(", "x":9, "y":1.5},
-                {"label":")", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Bksp", "x":13, "y":1.5, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "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":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
-
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"NUBS", "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":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"Space", "x":4, "y":5.5, "w":7},
-                {"label":"Alt", "x":11, "y":5.5, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+
+                {"matrix": [0, 7], "x": 15.25, "y": 0},
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+                {"matrix": [0, 8], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [2, 1], "x": 2, "y": 1.5},
+                {"matrix": [3, 1], "x": 3, "y": 1.5},
+                {"matrix": [2, 2], "x": 4, "y": 1.5},
+                {"matrix": [3, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [3, 3], "x": 7, "y": 1.5},
+                {"matrix": [2, 4], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [3, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 6], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [3, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 8], "x": 17.25, "y": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+                {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 17.25, "y": 2.5},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 6], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 7], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 7], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 8], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/nix_studio/oxalys80/oxalys80.c b/keyboards/nix_studio/oxalys80/oxalys80.c
index c5078a9f83..cfebb71043 100644
--- a/keyboards/nix_studio/oxalys80/oxalys80.c
+++ b/keyboards/nix_studio/oxalys80/oxalys80.c
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "oxalys80.h"
 
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {  // EEPROM is getting reset!
   rgblight_enable(); // Enable RGB by default
diff --git a/keyboards/nix_studio/oxalys80/oxalys80.h b/keyboards/nix_studio/oxalys80/oxalys80.h
deleted file mode 100644
index 2a9f789b5d..0000000000
--- a/keyboards/nix_studio/oxalys80/oxalys80.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* Copyright 2021 Nix Studio
- *
- * 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"
-
-#define ___ KC_NO
-
-/* LAYOUT_all
- *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- *              │00 │   │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │06 │16 │ │07 │17 │08 │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
- *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │66 │ │27 │37 │28 │      │36     │ 2u Backspace
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
- *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56   │ │47 │57 │48 │        │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐76  │ ISO Enter
- *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │76      │                   │56 │    │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
- * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │96 │     │97 │       │86        │ 2.75u RShift
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
- *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │B6  │ │A7 │B7 │A8 │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- *              │A0   │B0 │A1   │A3                         │B5   │A6 │B6   │ Tsangan
- *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
- *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
- *              │A0   │   │A1   │A3                         │B5   │   │B6   │ WKL
- *              └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘
- */
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_all(\
-    K00,      K01, K11, K02, K12,   K03, K13, K04, K14,    K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K66,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                       \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96,             K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,        KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, K66, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, K96, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi_tsangan(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                     KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_ansi_wkl(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,   K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                  \
-    K80,      K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0,      KA1,                KA3,                     KB5,      KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { ___, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
-    { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                KA5, KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, KA5, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso_tsangan(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0, KB0, KA1,                KA3,                     KB5, KA6, KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, KA6, KA7, KA8 }, \
-    { KB0, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}
-
-#define LAYOUT_tkl_iso_wkl(\
-    K00,      K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,   K07, K17, K08, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,   K27, K37, K28, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46,        K47, K57, K48, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K56, K76,                  \
-    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,      K86,        K97,      \
-    KA0,      KA1,                KA3,                     KB5,      KB6,   KA7, KB7, KA8  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
-    { ___, K11, K12, K13, K14, K15, K16, K17, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___ }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, ___ }, \
-    { K60, K61, K62, K63, K64, K65, ___, ___, ___ }, \
-    { K70, K71, K72, K73, K74, K75, K76, ___, ___ }, \
-    { K80, K81, K82, K83, K84, K85, K86, ___, ___ }, \
-    { K90, K91, K92, K93, K94, K95, ___, K97, ___ }, \
-    { KA0, KA1, ___, KA3, ___, ___, ___, KA7, KA8 }, \
-    { ___, ___, ___, ___, ___, KB5, KB6, KB7, ___ }  \
-}