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

2 files changed, 1225 insertions, 204 deletions

diff --git a/keyboards/omnikeyish/info.json b/keyboards/omnikeyish/info.json
index c7cf6ef7e3..f97ed3ca56 100644
--- a/keyboards/omnikeyish/info.json
+++ b/keyboards/omnikeyish/info.json
@@ -17,79 +17,1249 @@
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"F1", "x":4.6667, "y":0}, {"label":"F2", "x":5.6667, "y":0}, {"label":"F3", "x":6.6667, "y":0}, {"label":"F4", "x":7.6667, "y":0}, {"label":"F5", "x":9.1667, "y":0}, {"label":"F6", "x":10.1667, "y":0}, {"label":"F7", "x":11.1667, "y":0}, {"label":"F8", "x":12.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0}, {"x":21.6667, "y":0}, {"x":22.6667, "y":0}, {"x":23.6667, "y":0}, {"x":24.6667, "y":0},
-                        {"label":"P1", "x":0, "y":2}, {"label":"P2", "x":1, "y":2}, {"label":"~", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"P3", "x":0, "y":3}, {"label":"P4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"|", "x":16.1667, "y":3, "w":1.5}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"P5", "x":0, "y":4}, {"label":"P6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"label":"~", "x":15.4167, "y":4}, {"label":"Enter", "x":16.4167, "y":4, "w":1.25}, {"x":18.1667, "y":4}, {"x":19.1667, "y":4}, {"x":20.1667, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"P7", "x":0, "y":5}, {"label":"P8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":1.25}, {"label":"|", "x":3.9167, "y":5}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"x":18.1667, "y":5}, {"label":"\u2191", "x":19.1667, "y":5}, {"x":20.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"P9", "x":0, "y":6}, {"label":"P10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.25}, {"label":"Win", "x":3.9167, "y":6, "w":1.25}, {"label":"Alt", "x":5.1667, "y":6, "w":1.25}, {"x":6.4167, "y":6, "w":6.25}, {"label":"Alt Gr", "x":12.6667, "y":6, "w":1.25}, {"label":"Win", "x":13.9167, "y":6, "w":1.25}, {"label":"Compose", "x":15.1667, "y":6, "w":1.25}, {"label":"Ctrl", "x":16.4167, "y":6, "w":1.25}, {"label":"\u2190", "x":18.1667, "y":6}, {"label":"\u2193", "x":19.1667, "y":6}, {"label":"\u2192", "x":20.1667, "y":6}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [0, 19], "x": 21.6667, "y": 0},
+                {"matrix": [0, 20], "x": 22.6667, "y": 0},
+                {"matrix": [0, 21], "x": 23.6667, "y": 0},
+                {"matrix": [0, 22], "x": 24.6667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 15], "x": 16.1667, "y": 3, "w": 1.5},
+
+                {"matrix": [2, 16], "x": 18.1667, "y": 3},
+                {"matrix": [2, 17], "x": 19.1667, "y": 3},
+                {"matrix": [2, 18], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 19], "x": 21.6667, "y": 3},
+                {"matrix": [2, 20], "x": 22.6667, "y": 3},
+                {"matrix": [2, 21], "x": 23.6667, "y": 3},
+                {"matrix": [2, 22], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+
+                {"matrix": [3, 2], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 3], "x": 4.4167, "y": 4},
+                {"matrix": [3, 4], "x": 5.4167, "y": 4},
+                {"matrix": [3, 5], "x": 6.4167, "y": 4},
+                {"matrix": [3, 6], "x": 7.4167, "y": 4},
+                {"matrix": [3, 7], "x": 8.4167, "y": 4},
+                {"matrix": [3, 8], "x": 9.4167, "y": 4},
+                {"matrix": [3, 9], "x": 10.4167, "y": 4},
+                {"matrix": [3, 10], "x": 11.4167, "y": 4},
+                {"matrix": [3, 11], "x": 12.4167, "y": 4},
+                {"matrix": [3, 12], "x": 13.4167, "y": 4},
+                {"matrix": [3, 13], "x": 14.4167, "y": 4},
+                {"matrix": [3, 14], "x": 15.4167, "y": 4},
+                {"matrix": [3, 15], "x": 16.4167, "y": 4, "w": 1.25},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.9167, "y": 5},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.9167, "y": 6, "w": 1.25},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.25},
+                {"matrix": [5, 9], "x": 6.4167, "y": 6, "w": 6.25},
+                {"matrix": [5, 12], "x": 12.6667, "y": 6, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.9167, "y": 6, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.1667, "y": 6, "w": 1.25},
+                {"matrix": [5, 15], "x": 16.4167, "y": 6, "w": 1.25},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_101": {
-            "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":"Backspace", "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":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, 
-                        {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2},
-                        {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5},
-                        {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2},
-                        {"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}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 5], "x": 3, "y": 0},
+                {"matrix": [0, 6], "x": 4, "y": 0},
+                {"matrix": [0, 7], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [0, 9], "x": 7.5, "y": 0},
+                {"matrix": [0, 10], "x": 8.5, "y": 0},
+                {"matrix": [0, 11], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 12], "x": 11, "y": 0},
+                {"matrix": [0, 13], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0},
+                {"matrix": [0, 15], "x": 14, "y": 0},
+
+                {"matrix": [0, 16], "x": 15.25, "y": 0},
+                {"matrix": [0, 17], "x": 16.25, "y": 0},
+                {"matrix": [0, 18], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 2], "x": 0, "y": 1.5},
+                {"matrix": [1, 3], "x": 1, "y": 1.5},
+                {"matrix": [1, 4], "x": 2, "y": 1.5},
+                {"matrix": [1, 5], "x": 3, "y": 1.5},
+                {"matrix": [1, 6], "x": 4, "y": 1.5},
+                {"matrix": [1, 7], "x": 5, "y": 1.5},
+                {"matrix": [1, 8], "x": 6, "y": 1.5},
+                {"matrix": [1, 9], "x": 7, "y": 1.5},
+                {"matrix": [1, 10], "x": 8, "y": 1.5},
+                {"matrix": [1, 11], "x": 9, "y": 1.5},
+                {"matrix": [1, 12], "x": 10, "y": 1.5},
+                {"matrix": [1, 13], "x": 11, "y": 1.5},
+                {"matrix": [1, 14], "x": 12, "y": 1.5},
+                {"matrix": [1, 15], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 16], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 17], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 18], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 19], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 20], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 21], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 22], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 3], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 14], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 16], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 17], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 18], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 19], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 20], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 21], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 22], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 3], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 15], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [3, 19], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 20], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 21], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 2], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 4], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 12], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 17], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 19], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 20], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 21], "x": 20.5, "y": 4.5},
+                {"matrix": [4, 22], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 9], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 17], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 18], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 19], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 21], "x": 20.5, "y": 5.5}
+            ]
         },
         "LAYOUT_ultra_t": {
-            "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"F1", "x":4.6667, "y":0}, {"label":"F2", "x":5.6667, "y":0}, {"label":"F3", "x":6.6667, "y":0}, {"label":"F4", "x":7.6667, "y":0}, {"label":"F5", "x":9.1667, "y":0}, {"label":"F6", "x":10.1667, "y":0}, {"label":"F7", "x":11.1667, "y":0}, {"label":"F8", "x":12.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"P1", "x":0, "y":2}, {"label":"P2", "x":1, "y":2}, {"label":"~", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"P3", "x":0, "y":3}, {"label":"P4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"P5", "x":0, "y":4}, {"label":"P6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"P7", "x":0, "y":5}, {"label":"P8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2191", "x":19.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"P9", "x":0, "y":6}, {"label":"P10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"*", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"\u2190", "x":18.1667, "y":6}, {"label":"\u2193", "x":19.1667, "y":6}, {"label":"\u2192", "x":20.1667, "y":6}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
 
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
 
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_ultra_rev1": {
-            "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"F1", "x":2.6667, "y":0}, {"label":"F2", "x":3.6667, "y":0}, {"label":"F3", "x":4.6667, "y":0}, {"label":"F4", "x":5.6667, "y":0}, {"label":"F5", "x":8.1667, "y":0}, {"label":"F6", "x":9.1667, "y":0}, {"label":"F7", "x":10.1667, "y":0}, {"label":"F8", "x":11.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"P1", "x":0, "y":2}, {"label":"P2", "x":1, "y":2}, {"label":"Esc", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"P3", "x":0, "y":3}, {"label":"P4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"P5", "x":0, "y":4}, {"label":"P6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"x":18.1667, "y":4}, {"label":"\u2191", "x":19.1667, "y":4}, {"x":20.1667, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"P7", "x":0, "y":5}, {"label":"P8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2190", "x":18.1667, "y":5}, {"label":"\u2193", "x":19.1667, "y":5}, {"label":"\u2192", "x":20.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"P9", "x":0, "y":6}, {"label":"P10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"~", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"Insert", "x":18.1667, "y":6, "w":1.5}, {"label":"Delete", "x":19.6667, "y":6, "w":1.5}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 4], "x": 2.6667, "y": 0},
+                {"matrix": [0, 5], "x": 3.6667, "y": 0},
+                {"matrix": [0, 6], "x": 4.6667, "y": 0},
+                {"matrix": [0, 7], "x": 5.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 8.1667, "y": 0},
+                {"matrix": [0, 9], "x": 9.1667, "y": 0},
+                {"matrix": [0, 10], "x": 10.1667, "y": 0},
+                {"matrix": [0, 11], "x": 11.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_ultra_rev3": {
-            "layout": [ {"label":"P11", "x":0, "y":0}, {"label":"P12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"F1", "x":4.6667, "y":0}, {"label":"F2", "x":5.6667, "y":0}, {"label":"F3", "x":6.6667, "y":0}, {"label":"F4", "x":7.6667, "y":0}, {"label":"F5", "x":9.1667, "y":0}, {"label":"F6", "x":10.1667, "y":0}, {"label":"F7", "x":11.1667, "y":0}, {"label":"F8", "x":12.1667, "y":0}, {"label":"F9", "x":13.6667, "y":0}, {"label":"F10", "x":14.6667, "y":0}, {"label":"F11", "x":15.6667, "y":0}, {"label":"F12", "x":16.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"P1", "x":0, "y":2}, {"label":"P2", "x":1, "y":2}, {"label":"~", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"P3", "x":0, "y":3}, {"label":"P4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"P5", "x":0, "y":4}, {"label":"P6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"x":18.1667, "y":4}, {"label":"\u2191", "x":19.1667, "y":4}, {"x":20.1667, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"P7", "x":0, "y":5}, {"label":"P8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2190", "x":18.1667, "y":5}, {"label":"\u2193", "x":19.1667, "y":5}, {"label":"\u2192", "x":20.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"P9", "x":0, "y":6}, {"label":"P10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"Compose", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"Insert", "x":18.1667, "y":6, "w":1.5}, {"label":"Delete", "x":19.6667, "y":6, "w":1.5}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 4], "x": 4.6667, "y": 0},
+                {"matrix": [0, 5], "x": 5.6667, "y": 0},
+                {"matrix": [0, 6], "x": 6.6667, "y": 0},
+                {"matrix": [0, 7], "x": 7.6667, "y": 0},
+
+                {"matrix": [0, 8], "x": 9.1667, "y": 0},
+                {"matrix": [0, 9], "x": 10.1667, "y": 0},
+                {"matrix": [0, 10], "x": 11.1667, "y": 0},
+                {"matrix": [0, 11], "x": 12.1667, "y": 0},
+
+                {"matrix": [0, 12], "x": 13.6667, "y": 0},
+                {"matrix": [0, 13], "x": 14.6667, "y": 0},
+                {"matrix": [0, 14], "x": 15.6667, "y": 0},
+                {"matrix": [0, 15], "x": 16.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_plus_rev3": {
-            "layout": [ {"label":"F11", "x":0, "y":0}, {"label":"F12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"F1", "x":0, "y":2}, {"label":"F2", "x":1, "y":2}, {"label":"~", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"F3", "x":0, "y":3}, {"label":"F4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"F5", "x":0, "y":4}, {"label":"F6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"x":18.1667, "y":4}, {"label":"\u2191", "x":19.1667, "y":4}, {"x":20.1667, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"F7", "x":0, "y":5}, {"label":"F8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2190", "x":18.1667, "y":5}, {"label":"\u2193", "x":19.1667, "y":5}, {"label":"\u2192", "x":20.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"F9", "x":0, "y":6}, {"label":"F10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"Compose", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"Insert", "x":18.1667, "y":6, "w":1.5}, {"label":"Delete", "x":19.6667, "y":6, "w":1.5}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_plus_rev1": {
-            "layout": [ {"label":"F11", "x":0, "y":0}, {"label":"F12", "x":1, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"F1", "x":0, "y":2}, {"label":"F2", "x":1, "y":2}, {"label":"Esc", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"F3", "x":0, "y":3}, {"label":"F4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"F5", "x":0, "y":4}, {"label":"F6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"x":18.1667, "y":4}, {"label":"\u2191", "x":19.1667, "y":4}, {"x":20.1667, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"F7", "x":0, "y":5}, {"label":"F8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2190", "x":18.1667, "y":5}, {"label":"\u2193", "x":19.1667, "y":5}, {"label":"\u2192", "x":20.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"F9", "x":0, "y":6}, {"label":"F10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"~", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"Insert", "x":18.1667, "y":6, "w":1.5}, {"label":"Delete", "x":19.6667, "y":6, "w":1.5}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 16], "x": 18.1667, "y": 4},
+                {"matrix": [3, 17], "x": 19.1667, "y": 4},
+                {"matrix": [3, 18], "x": 20.1667, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 16], "x": 18.1667, "y": 5},
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+                {"matrix": [4, 18], "x": 20.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 18], "x": 19.6667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_102_rev1": {
-            "layout": [ {"label":"F11", "x":0, "y":0}, {"label":"F12", "x":1, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"F1", "x":0, "y":2}, {"label":"F2", "x":1, "y":2},{"label":"Esc", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"F3", "x":0, "y":3}, {"label":"F4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"F5", "x":0, "y":4}, {"label":"F6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"F7", "x":0, "y":5}, {"label":"F8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2191", "x":19.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"F9", "x":0, "y":6}, {"label":"F10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"~", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"\u2190", "x":18.1667, "y":6}, {"label":"\u2193", "x":19.1667, "y":6}, {"label":"\u2192", "x":20.1667, "y":6}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
+
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
         },
         "LAYOUT_102_rev3": {
-            "layout": [ {"label":"F11", "x":0, "y":0}, {"label":"F12", "x":1, "y":0}, {"label":"Esc", "x":2.6667, "y":0}, {"label":"PrtSc", "x":18.1667, "y":0}, {"label":"Scroll Lock", "x":19.1667, "y":0}, {"label":"Pause", "x":20.1667, "y":0},
-                        {"label":"F1", "x":0, "y":2}, {"label":"F2", "x":1, "y":2}, {"label":"~", "x":2.6667, "y":2}, {"label":"!", "x":3.6667, "y":2}, {"label":"@", "x":4.6667, "y":2}, {"label":"#", "x":5.6667, "y":2}, {"label":"$", "x":6.6667, "y":2}, {"label":"%", "x":7.6667, "y":2}, {"label":"^", "x":8.6667, "y":2}, {"label":"&", "x":9.6667, "y":2}, {"label":"*", "x":10.6667, "y":2}, {"label":"(", "x":11.6667, "y":2}, {"label":")", "x":12.6667, "y":2}, {"label":"_", "x":13.6667, "y":2}, {"label":"+", "x":14.6667, "y":2}, {"label":"Back Space", "x":15.6667, "y":2, "w":2}, {"label":"Insert", "x":18.1667, "y":2}, {"label":"Home", "x":19.1667, "y":2}, {"label":"PgUp", "x":20.1667, "y":2}, {"label":"Num Lock", "x":21.6667, "y":2}, {"label":"/", "x":22.6667, "y":2}, {"label":"*", "x":23.6667, "y":2}, {"label":"-", "x":24.6667, "y":2},
-                        {"label":"F3", "x":0, "y":3}, {"label":"F4", "x":1, "y":3}, {"label":"Tab", "x":2.6667, "y":3, "w":1.5}, {"label":"Q", "x":4.1667, "y":3}, {"label":"W", "x":5.1667, "y":3}, {"label":"E", "x":6.1667, "y":3}, {"label":"R", "x":7.1667, "y":3}, {"label":"T", "x":8.1667, "y":3}, {"label":"Y", "x":9.1667, "y":3}, {"label":"U", "x":10.1667, "y":3}, {"label":"I", "x":11.1667, "y":3}, {"label":"O", "x":12.1667, "y":3}, {"label":"P", "x":13.1667, "y":3}, {"label":"{", "x":14.1667, "y":3}, {"label":"}", "x":15.1667, "y":3}, {"label":"Enter", "x":16.1667, "y":3, "w":1.5, "h":2}, {"label":"Delete", "x":18.1667, "y":3}, {"label":"End", "x":19.1667, "y":3}, {"label":"PgDn", "x":20.1667, "y":3}, {"label":"7", "x":21.6667, "y":3}, {"label":"8", "x":22.6667, "y":3}, {"label":"9", "x":23.6667, "y":3}, {"label":"+", "x":24.6667, "y":3},
-                        {"label":"F5", "x":0, "y":4}, {"label":"F6", "x":1, "y":4}, {"label":"Caps Lock", "x":2.6667, "y":4, "w":1.75}, {"label":"A", "x":4.4167, "y":4}, {"label":"S", "x":5.4167, "y":4}, {"label":"D", "x":6.4167, "y":4}, {"label":"F", "x":7.4167, "y":4}, {"label":"G", "x":8.4167, "y":4}, {"label":"H", "x":9.4167, "y":4}, {"label":"J", "x":10.4167, "y":4}, {"label":"K", "x":11.4167, "y":4}, {"label":"L", "x":12.4167, "y":4}, {"label":":", "x":13.4167, "y":4}, {"label":"\"", "x":14.4167, "y":4}, {"label":"4", "x":21.6667, "y":4}, {"label":"5", "x":22.6667, "y":4}, {"label":"6", "x":23.6667, "y":4}, {"label":"=", "x":24.6667, "y":4},
-                        {"label":"F7", "x":0, "y":5}, {"label":"F8", "x":1, "y":5}, {"label":"Shift", "x":2.6667, "y":5, "w":2.25}, {"label":"Z", "x":4.9167, "y":5}, {"label":"X", "x":5.9167, "y":5}, {"label":"C", "x":6.9167, "y":5}, {"label":"V", "x":7.9167, "y":5}, {"label":"B", "x":8.9167, "y":5}, {"label":"N", "x":9.9167, "y":5}, {"label":"M", "x":10.9167, "y":5}, {"label":"<", "x":11.9167, "y":5}, {"label":">", "x":12.9167, "y":5}, {"label":"?", "x":13.9167, "y":5}, {"label":"Shift", "x":14.9167, "y":5, "w":1.75}, {"label":"|", "x":16.6667, "y":5}, {"label":"\u2191", "x":19.1667, "y":5}, {"label":"1", "x":21.6667, "y":5}, {"label":"2", "x":22.6667, "y":5}, {"label":"3", "x":23.6667, "y":5}, {"label":"Enter", "x":24.6667, "y":5, "h":2},
-                        {"label":"F9", "x":0, "y":6}, {"label":"F10", "x":1, "y":6}, {"label":"Ctrl", "x":2.6667, "y":6, "w":1.5}, {"label":"Win", "x":4.1667, "y":6}, {"label":"Alt", "x":5.1667, "y":6, "w":1.5}, {"x":6.6667, "y":6, "w":7}, {"label":"Alt Gr", "x":13.6667, "y":6, "w":1.5}, {"label":"*", "x":15.1667, "y":6}, {"label":"Ctrl", "x":16.1667, "y":6, "w":1.5}, {"label":"\u2190", "x":18.1667, "y":6}, {"label":"\u2193", "x":19.1667, "y":6}, {"label":"\u2192", "x":20.1667, "y":6}, {"label":"0", "x":21.6667, "y":6, "w":2}, {"label":".", "x":23.6667, "y":6}]
-        }
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+
+                {"matrix": [0, 2], "x": 2.6667, "y": 0},
+
+                {"matrix": [0, 16], "x": 18.1667, "y": 0},
+                {"matrix": [0, 17], "x": 19.1667, "y": 0},
+                {"matrix": [0, 18], "x": 20.1667, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+
+                {"matrix": [1, 2], "x": 2.6667, "y": 2},
+                {"matrix": [1, 3], "x": 3.6667, "y": 2},
+                {"matrix": [1, 4], "x": 4.6667, "y": 2},
+                {"matrix": [1, 5], "x": 5.6667, "y": 2},
+                {"matrix": [1, 6], "x": 6.6667, "y": 2},
+                {"matrix": [1, 7], "x": 7.6667, "y": 2},
+                {"matrix": [1, 8], "x": 8.6667, "y": 2},
+                {"matrix": [1, 9], "x": 9.6667, "y": 2},
+                {"matrix": [1, 10], "x": 10.6667, "y": 2},
+                {"matrix": [1, 11], "x": 11.6667, "y": 2},
+                {"matrix": [1, 12], "x": 12.6667, "y": 2},
+                {"matrix": [1, 13], "x": 13.6667, "y": 2},
+                {"matrix": [1, 14], "x": 14.6667, "y": 2},
+                {"matrix": [1, 15], "x": 15.6667, "y": 2, "w": 2},
+
+                {"matrix": [1, 16], "x": 18.1667, "y": 2},
+                {"matrix": [1, 17], "x": 19.1667, "y": 2},
+                {"matrix": [1, 18], "x": 20.1667, "y": 2},
+
+                {"matrix": [1, 19], "x": 21.6667, "y": 2},
+                {"matrix": [1, 20], "x": 22.6667, "y": 2},
+                {"matrix": [1, 21], "x": 23.6667, "y": 2},
+                {"matrix": [1, 22], "x": 24.6667, "y": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+
+                {"matrix": [2, 2], "x": 2.6667, "y": 3, "w": 1.5},
+                {"matrix": [2, 3], "x": 4.1667, "y": 3},
+                {"matrix": [2, 4], "x": 5.1667, "y": 3},
+                {"matrix": [2, 5], "x": 6.1667, "y": 3},
+                {"matrix": [2, 6], "x": 7.1667, "y": 3},
+                {"matrix": [2, 7], "x": 8.1667, "y": 3},
+                {"matrix": [2, 8], "x": 9.1667, "y": 3},
+                {"matrix": [2, 9], "x": 10.1667, "y": 3},
+                {"matrix": [2, 10], "x": 11.1667, "y": 3},
+                {"matrix": [2, 11], "x": 12.1667, "y": 3},
+                {"matrix": [2, 12], "x": 13.1667, "y": 3},
+                {"matrix": [2, 13], "x": 14.1667, "y": 3},
+                {"matrix": [2, 14], "x": 15.1667, "y": 3},
+                {"matrix": [2, 16], "x": 16.1667, "y": 3, "w": 1.5, "h": 2},
+
+                {"matrix": [2, 17], "x": 18.1667, "y": 3},
+                {"matrix": [2, 18], "x": 19.1667, "y": 3},
+                {"matrix": [2, 19], "x": 20.1667, "y": 3},
 
+                {"matrix": [2, 20], "x": 21.6667, "y": 3},
+                {"matrix": [2, 21], "x": 22.6667, "y": 3},
+                {"matrix": [2, 22], "x": 23.6667, "y": 3},
+                {"matrix": [3, 0], "x": 24.6667, "y": 3},
+
+                {"matrix": [3, 1], "x": 0, "y": 4},
+                {"matrix": [3, 2], "x": 1, "y": 4},
+
+                {"matrix": [3, 3], "x": 2.6667, "y": 4, "w": 1.75},
+                {"matrix": [3, 4], "x": 4.4167, "y": 4},
+                {"matrix": [3, 5], "x": 5.4167, "y": 4},
+                {"matrix": [3, 6], "x": 6.4167, "y": 4},
+                {"matrix": [3, 7], "x": 7.4167, "y": 4},
+                {"matrix": [3, 8], "x": 8.4167, "y": 4},
+                {"matrix": [3, 9], "x": 9.4167, "y": 4},
+                {"matrix": [3, 10], "x": 10.4167, "y": 4},
+                {"matrix": [3, 11], "x": 11.4167, "y": 4},
+                {"matrix": [3, 12], "x": 12.4167, "y": 4},
+                {"matrix": [3, 13], "x": 13.4167, "y": 4},
+                {"matrix": [3, 15], "x": 14.4167, "y": 4},
+
+                {"matrix": [3, 19], "x": 21.6667, "y": 4},
+                {"matrix": [3, 20], "x": 22.6667, "y": 4},
+                {"matrix": [3, 21], "x": 23.6667, "y": 4},
+                {"matrix": [3, 22], "x": 24.6667, "y": 4},
+
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+
+                {"matrix": [4, 2], "x": 2.6667, "y": 5, "w": 2.25},
+                {"matrix": [4, 4], "x": 4.9167, "y": 5},
+                {"matrix": [4, 5], "x": 5.9167, "y": 5},
+                {"matrix": [4, 6], "x": 6.9167, "y": 5},
+                {"matrix": [4, 7], "x": 7.9167, "y": 5},
+                {"matrix": [4, 8], "x": 8.9167, "y": 5},
+                {"matrix": [4, 9], "x": 9.9167, "y": 5},
+                {"matrix": [4, 10], "x": 10.9167, "y": 5},
+                {"matrix": [4, 11], "x": 11.9167, "y": 5},
+                {"matrix": [4, 12], "x": 12.9167, "y": 5},
+                {"matrix": [4, 13], "x": 13.9167, "y": 5},
+                {"matrix": [4, 14], "x": 14.9167, "y": 5, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.6667, "y": 5},
+
+                {"matrix": [4, 17], "x": 19.1667, "y": 5},
+
+                {"matrix": [4, 19], "x": 21.6667, "y": 5},
+                {"matrix": [4, 20], "x": 22.6667, "y": 5},
+                {"matrix": [4, 21], "x": 23.6667, "y": 5},
+                {"matrix": [4, 22], "x": 24.6667, "y": 5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 6},
+                {"matrix": [5, 1], "x": 1, "y": 6},
+
+                {"matrix": [5, 2], "x": 2.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 3], "x": 4.1667, "y": 6},
+                {"matrix": [5, 4], "x": 5.1667, "y": 6, "w": 1.5},
+                {"matrix": [5, 9], "x": 6.6667, "y": 6, "w": 7},
+                {"matrix": [5, 12], "x": 13.6667, "y": 6, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.1667, "y": 6},
+                {"matrix": [5, 15], "x": 16.1667, "y": 6, "w": 1.5},
+
+                {"matrix": [5, 16], "x": 18.1667, "y": 6},
+                {"matrix": [5, 17], "x": 19.1667, "y": 6},
+                {"matrix": [5, 18], "x": 20.1667, "y": 6},
+
+                {"matrix": [5, 19], "x": 21.6667, "y": 6, "w": 2},
+                {"matrix": [5, 21], "x": 23.6667, "y": 6}
+            ]
+        }
     }
 }
diff --git a/keyboards/omnikeyish/omnikeyish.h b/keyboards/omnikeyish/omnikeyish.h
index 93835bd45d..d39b3fb1d5 100644
--- a/keyboards/omnikeyish/omnikeyish.h
+++ b/keyboards/omnikeyish/omnikeyish.h
@@ -7,152 +7,3 @@ enum keycodes {
 };
 
 #include "dynamic_macro.h"
-
-#define ____ KC_NO
-
-/* Every possible switch positions on the PCB. Depending on plate and keycap choice, some of these positions will be blocked by other keys. */
-#define LAYOUT_all( \
-	K101, K102,   K103,       K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   K120, K121, K122, K123, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,   K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416,   K417, K418, K419,   K420, K421, K422, K423, \
-	K501, K502,   K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614, K615, K616,   K617, K618, K619,   K620,       K622        \
-) { \
- 	{ K101, K102,   K103, ____, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   K120, K121, K122, K123 }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416,   K417, K418, K419,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, K615, K616,   K617, K618, K619,   K620, ____, K622, ____ } \
-}
-
-/* Northgate Factory Plates. Most are based on internet research, user beware. */ 
-#define LAYOUT_101( \
-					K103,       K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119, \
-					K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-					K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,   K317, K318, K319,   K320, K321, K322, K323, \
-					K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,                          K420, K421, K422,       \
-					K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514,    K515,            K518,         K520, K521, K522, K523, \
-					K603,       K605,                               K610,       K613,             K616,   K617, K618, K619,   K620,       K622  \
-) { \
-	{ ____, ____,   K103, ____, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ ____, ____,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ ____, ____,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ ____, ____,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   ____, ____, ____,   K420, K421, K422, ____ }, \
-	{ ____, ____,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, ____,   ____, K518, ____,   K520, K521, K522, K523 }, \
-	{ ____, ____,   K603, ____, K605, ____, ____, ____, ____, K610, ____, ____, K613, ____, ____, K616,   K617, K618, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_102_rev1( \
-	K101, K102,              																			K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,                          K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,         K518,         K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,   K617, K618, K619,   K620,       K622  \
-) { \
- 	{ K101, K102,   ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   ____, ____, ____,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   ____, K518, ____,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, K618, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_102_rev3( \
-	K101, K102,   K103,       																			K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,                          K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,         K518,         K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,   K617, K618, K619,   K620,       K622  \
-) { \
- 	{ K101, K102,   K103, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   ____, ____, ____,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   ____, K518, ____,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, K618, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_plus_rev1( \
-	K101, K102,              																			K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,      K417, K418, K419,   K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,      K617, K619,      K620,       K622  \
-) { \
- 	{ K101, K102,   ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   K417, K418, K419,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, ____, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_plus_rev3( \
-	K101, K102,   K103,       																			K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,      K417, K418, K419,   K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,      K617, K619,      K620,       K622  \
-) { \
- 	{ K101, K102,   K103, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   K417, K418, K419,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, ____, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_ultra_rev1( \
-	K101, K102,               K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,	K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,      K417, K418, K419,   K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,      K617, K619,      K620,       K622  \
-) { \
- 	{ K101, K102,   ____, ____, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   K417, K418, K419,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, ____, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_ultra_rev3( \
-	K101, K102,   K103,       K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,	K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,      K417, K418, K419,   K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,      K617, K619,      K620,       K622  \
-) { \
- 	{ K101, K102,   K103, ____, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   K417, K418, K419,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   K517, K518, K519,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, ____, K619,   K620, ____, K622, ____ } \
-}
-
-#define LAYOUT_ultra_t( \
-	K101, K102,   K103,       K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119, \
-	K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223, \
-	K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315,         K317, K318, K319,   K320, K321, K322, K323, \
-	K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,    K416,                          K420, K421, K422, K423, \
-	K501, K502,   K503,       K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,         K518,         K520, K521, K522, K523, \
-	K601, K602,   K603, K604, K605,                         K610,             K613, K614,       K616,   K617, K618, K619,   K620,       K622  \
-) { \
- 	{ K101, K102,   K103, ____, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,   K117, K118, K119,   ____, ____, ____, ____ }, \
-	{ K201, K202,   K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,   K217, K218, K219,   K220, K221, K222, K223 }, \
-	{ K301, K302,   K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, ____,   K317, K318, K319,   K320, K321, K322, K323 }, \
-	{ K401, K402,   K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, ____, K416,   ____, ____, ____,   K420, K421, K422, K423 }, \
-	{ K501, K502,   K503, ____, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516,   ____, K518, ____,   K520, K521, K522, K523 }, \
-	{ K601, K602,   K603, K604, K605, ____, ____, ____, ____, K610, ____, ____, K613, K614, ____, K616,   K617, K618, K619,   K620, ____, K622, ____ } \
-}
-