diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
index f34dfa63fe..71760995eb 100644
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ b/keyboards/ashpil/modelm_usbc/info.json
@@ -20,10 +20,251 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_fullsize_iso_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"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":"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.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"4", "x":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":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":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": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
         },
-		"LAYOUT_fullsize_ansi_wkl": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"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.5}, {"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_fullsize_ansi_wkl": {
+            "layout": [
+                {"matrix": [0, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 3], "x": 2, "y": 0},
+                {"matrix": [2, 4], "x": 3, "y": 0},
+                {"matrix": [1, 4], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [1, 9], "x": 8.5, "y": 0},
+                {"matrix": [2, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 11], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+
+                {"matrix": [3, 15], "x": 15.25, "y": 0},
+                {"matrix": [4, 15], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "y": 0},
+
+                {"matrix": [2, 2], "x": 0, "y": 1.5},
+                {"matrix": [3, 2], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [3, 4], "x": 3, "y": 1.5},
+                {"matrix": [3, 5], "x": 4, "y": 1.5},
+                {"matrix": [2, 5], "x": 5, "y": 1.5},
+                {"matrix": [2, 7], "x": 6, "y": 1.5},
+                {"matrix": [3, 7], "x": 7, "y": 1.5},
+                {"matrix": [3, 8], "x": 8, "y": 1.5},
+                {"matrix": [3, 9], "x": 9, "y": 1.5},
+                {"matrix": [3, 10], "x": 10, "y": 1.5},
+                {"matrix": [2, 10], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
+
+                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
+
+                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/ashpil/modelm_usbc/modelm_usbc.c
index e505c72233..92b577635c 100644
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.c
+++ b/keyboards/ashpil/modelm_usbc/modelm_usbc.c
@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www./gnu.org/licenses/>.
  */
-#include "modelm_usbc.h"
+
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   /* Setting status LEDs pins to output and +5V (off) */
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.h b/keyboards/ashpil/modelm_usbc/modelm_usbc.h
deleted file mode 100644
index da50b865c7..0000000000
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- * The first section contains "names" for physical keys of the keyboard
- * and defines their position on the board.
- * The second section defines position of the keys on the switch matrix 
- * (where COLUMNS and ROWS crosses). */
-
-#define LAYOUT_fullsize_ansi_wkl( \
-    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,   K5N, K5O, K5P, \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,   K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L,      K2N,                    K2O, K2P, K2Q, \
-    K1A,      K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,        K1N,        K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,   K0F, K0G, K0H,   K0I,      K0J \
-) \
-{ \
-    { KC_NO, KC_NO, K5A,   KC_NO, K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   KC_NO, K0I, K0J, K1N,   K0B   }, \
-    { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, KC_NO, KC_NO }, \
-    { K0A,   KC_NO, K4A,   K5B,   K5C,   K4F, K5J,   K4G, K4M,   K5I,   K4L,   K3O,   K4O, K4Q, K4P,   KC_NO }, \
-    { KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E, K5K,   K4H, K4I,   K4J,   K4K,   K5L,   K5M, K3Q, K3P,   K5N   }, \
-    { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, KC_NO, K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
-    { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, K3N,   K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   KC_NO }, \
-    { K0E,   K1M,   K1C,   K1D,   K1E,   K1F, K2N,   K1I, K1J,   K1K,   KC_NO, K4R,   K4S, K4T, K5P,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, KC_NO, KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }  \
-}
-
-#define LAYOUT_fullsize_iso_wkl( \
-    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,   K5N, K5O, K5P, \
-    \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M,        K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,                    K2O, K2P, K2Q, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,        K1N,        K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,   K0F, K0G, K0H,   K0I,      K0J \
-) \
-{ \
-    { KC_NO, KC_NO, K5A,   K1B,   K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   KC_NO, K0I, K0J, K1N,   K0B   }, \
-    { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, KC_NO, KC_NO }, \
-    { K0A,   KC_NO, K4A,   K5B,   K5C,   K4F, K5J,   K4G, K4M,   K5I,   K4L,   K3O,   K4O, K4Q, K4P,   KC_NO }, \
-    { KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E, K5K,   K4H, K4I,   K4J,   K4K,   K5L,   K5M, K3Q, K3P,   K5N   }, \
-    { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, KC_NO, K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
-    { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, KC_NO, K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   KC_NO }, \
-    { K0E,   K1M,   K1C,   K1D,   K1E,   K1F, K2N,   K1I, K1J,   K1K,   K2M,   K4R,   K4S, K4T, K5P,   KC_NO }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, KC_NO, KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }  \
-}
diff --git a/keyboards/bpiphany/ghost_squid/ghost_squid.h b/keyboards/bpiphany/ghost_squid/ghost_squid.h
index 55259ba740..63d3ea0d5e 100644
--- a/keyboards/bpiphany/ghost_squid/ghost_squid.h
+++ b/keyboards/bpiphany/ghost_squid/ghost_squid.h
@@ -21,59 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define fn_led_on() writePinLow(D0)
 #define fn_led_off() writePinHigh(D0)
-
-#define  ___ KC_NO
-
-/*
- *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- *              │J6 │   │I4 │H4 │H2 │H6 │ │A7 │E6 │D2 │D4 │ │B4 │B7 │B6 │B0 │ │C7 │C5 │A5 │
- *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
- *              │J4 │J7 │I7 │H7 │G7 │G4 │F4 │F7 │E7 │D7 │R7 │R4 │E4 │B2     │ │L4 │O4 │Q4 │ │K1 │L1 │Q1 │Q0 │
- *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤      ┌─────┐
- *              │J2   │J5 │I5 │H5 │G5 │G2 │F2 │F5 │E5 │D5 │R5 │R2 │E2 │B3   │ │K4 │O7 │Q7 │ │K5 │L5 │Q5 │O5 │      │     │
- *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │   ┌──┴┐B1  │ ISO Enter
- *  LShift      │I2    │J3 │I3 │H3 │G3 │G6 │F6 │F3 │E3 │D3 │R3 │R6 │B1      │               │K2 │L2 │Q2 │   │   │B3 │    │
- * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤   └───┴────┘
- * │N2      │   │N2  │I6 │J1 │I1 │H1 │G1 │G0 │F0 │F1 │E1 │D1 │R0 │N3        │     │O6 │     │K3 │L3 │Q3 │O3 │
- * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
- *              │A4  │P2  │C6  │K6                      │C0  │M3  │D0  │A1  │ │O0 │K0 │L0 │ │L6     │Q6 │   │
- *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
- */
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2,      \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , ___ , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
-#define LAYOUT_fullsize_iso( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5,                       \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2,        KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6, KB3, KB1,                    KK2, KL2, KQ2,      \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6       \
-    ) { /*        00-A  01-B  02-C  03-D  04-E  05-F  06-G  07-H  08-I  09-J  10-K  11-L  12-M  13-N  14-O  15-P  16-Q  17-R */ \
-        /* 0 */  { ___ , KB0 , KC0 , KD0 , ___ , KF0 , KG0 , ___ , ___ , ___ , KK0 , KL0 , ___ , ___ , KO0 , ___ , KQ0 , KR0 }, \
-        /* 1 */  { KA1 , KB1 , ___ , KD1 , KE1 , KF1 , KG1 , KH1 , KI1 , KJ1 , KK1 , KL1 , ___ , ___ , ___ , ___ , KQ1 , ___ }, \
-        /* 2 */  { ___ , KB2 , ___ , KD2 , KE2 , KF2 , KG2 , KH2 , KI2 , KJ2 , KK2 , KL2 , ___ , KN2 , ___ , KP2 , KQ2 , KR2 }, \
-        /* 3 */  { ___ , KB3 , ___ , KD3 , KE3 , KF3 , KG3 , KH3 , KI3 , KJ3 , KK3 , KL3 , KM3 , KN3 , KO3 , ___ , KQ3 , KR3 }, \
-        /* 4 */  { KA4 , KB4 , ___ , KD4 , KE4 , KF4 , KG4 , KH4 , KI4 , KJ4 , KK4 , KL4 , ___ , ___ , KO4 , ___ , KQ4 , KR4 }, \
-        /* 5 */  { KA5 , ___ , KC5 , KD5 , KE5 , KF5 , KG5 , KH5 , KI5 , KJ5 , KK5 , KL5 , ___ , ___ , KO5 , ___ , KQ5 , KR5 }, \
-        /* 6 */  { ___ , KB6 , KC6 , ___ , KE6 , KF6 , KG6 , KH6 , KI6 , KJ6 , KK6 , KL6 , ___ , ___ , KO6 , ___ , KQ6 , KR6 }, \
-        /* 7 */  { KA7 , KB7 , KC7 , KD7 , KE7 , KF7 , KG7 , KH7 , KI7 , KJ7 , ___ , ___ , ___ , ___ , KO7 , ___ , KQ7 , KR7 }  \
-    }
-
diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
index bed329ccaf..49b6e10309 100644
--- a/keyboards/bpiphany/ghost_squid/info.json
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -23,229 +23,255 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen,", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 9], "x": 0, "y": 0},
 
-                {"label":"`~", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2@", "x":2, "y":1.25},
-                {"label":"3#", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Ins", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h": 2},
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"Print Screen,", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 9], "x": 0, "y": 0},
 
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"Page Up", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [4, 8], "x": 2, "y": 0},
+                {"matrix": [4, 7], "x": 3, "y": 0},
+                {"matrix": [2, 7], "x": 4, "y": 0},
+                {"matrix": [6, 7], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"Page Down", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h": 2},
+                {"matrix": [7, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [2, 3], "x": 8.5, "y": 0},
+                {"matrix": [4, 3], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
+                {"matrix": [4, 1], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [6, 1], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+                {"matrix": [7, 2], "x": 15.25, "y": 0},
+                {"matrix": [5, 2], "x": 16.25, "y": 0},
+                {"matrix": [5, 0], "x": 17.25, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [4, 9], "x": 0, "y": 1.25},
+                {"matrix": [7, 9], "x": 1, "y": 1.25},
+                {"matrix": [7, 8], "x": 2, "y": 1.25},
+                {"matrix": [7, 7], "x": 3, "y": 1.25},
+                {"matrix": [7, 6], "x": 4, "y": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 1.25},
+                {"matrix": [7, 5], "x": 7, "y": 1.25},
+                {"matrix": [7, 4], "x": 8, "y": 1.25},
+                {"matrix": [7, 3], "x": 9, "y": 1.25},
+                {"matrix": [7, 17], "x": 10, "y": 1.25},
+                {"matrix": [4, 17], "x": 11, "y": 1.25},
+                {"matrix": [4, 4], "x": 12, "y": 1.25},
+                {"matrix": [2, 1], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [4, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 1.25},
+                {"matrix": [4, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 10], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 16], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 9], "x": 1.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 7], "x": 3.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [5, 17], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 12.5, "y": 2.25},
+
+                {"matrix": [4, 10], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 14], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [5, 10], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 11], "x": 19.5, "y": 2.25},
+                {"matrix": [5, 16], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 14], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [2, 8], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 9], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 17], "x": 10.75, "y": 3.25},
+                {"matrix": [6, 17], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 1], "x": 12.75, "y": 3.25},
+                {"matrix": [1, 1], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [2, 10], "x": 18.5, "y": 3.25},
+                {"matrix": [2, 11], "x": 19.5, "y": 3.25},
+                {"matrix": [2, 16], "x": 20.5, "y": 3.25},
+
+                {"matrix": [2, 13], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [6, 8], "x": 1.25, "y": 4.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.25},
+                {"matrix": [1, 8], "x": 3.25, "y": 4.25},
+                {"matrix": [1, 7], "x": 4.25, "y": 4.25},
+                {"matrix": [1, 6], "x": 5.25, "y": 4.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [0, 5], "x": 7.25, "y": 4.25},
+                {"matrix": [1, 5], "x": 8.25, "y": 4.25},
+                {"matrix": [1, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [1, 3], "x": 10.25, "y": 4.25},
+                {"matrix": [0, 17], "x": 11.25, "y": 4.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [6, 14], "x": 16.25, "y": 4.25},
+
+                {"matrix": [3, 10], "x": 18.5, "y": 4.25},
+                {"matrix": [3, 11], "x": 19.5, "y": 4.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 4.25},
+                {"matrix": [3, 14], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 15], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 10], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [0, 2], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [3, 12], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [0, 3], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [0, 10], "x": 16.25, "y": 5.25},
+                {"matrix": [0, 11], "x": 17.25, "y": 5.25},
+
+                {"matrix": [6, 11], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [6, 16], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/bpiphany/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 03e5162481..64a38a6e56 100644
--- a/keyboards/bpiphany/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
@@ -19,11 +19,257 @@
   "community_layouts": ["fullsize_ansi"],
   "layouts": {
     "LAYOUT": {
-      "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":1.25}, {"label":"KC_NUBS", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"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.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
-    },
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
 
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
+    },
     "LAYOUT_fullsize_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"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.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/kitten_paw/kitten_paw.h b/keyboards/bpiphany/kitten_paw/kitten_paw.h
deleted file mode 100644
index d4a9a16656..0000000000
--- a/keyboards/bpiphany/kitten_paw/kitten_paw.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2 | I6 | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
diff --git a/keyboards/bpiphany/tiger_lily/info.json b/keyboards/bpiphany/tiger_lily/info.json
index 75d126eb50..659c6f3267 100644
--- a/keyboards/bpiphany/tiger_lily/info.json
+++ b/keyboards/bpiphany/tiger_lily/info.json
@@ -19,10 +19,257 @@
   "community_layouts": ["fullsize_ansi"],
   "layouts": {
     "LAYOUT": {
-      "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":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":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.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 1.25},
+        {"matrix": [6, 8], "x": 1.25, "y": 4.5},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     },
     "LAYOUT_fullsize_ansi": {
-      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"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.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+      "layout": [
+        {"matrix": [6, 9], "x": 0, "y": 0},
+
+        {"matrix": [4, 8], "x": 2, "y": 0},
+        {"matrix": [4, 7], "x": 3, "y": 0},
+        {"matrix": [2, 7], "x": 4, "y": 0},
+        {"matrix": [6, 7], "x": 5, "y": 0},
+
+        {"matrix": [7, 0], "x": 6.5, "y": 0},
+        {"matrix": [6, 4], "x": 7.5, "y": 0},
+        {"matrix": [2, 3], "x": 8.5, "y": 0},
+        {"matrix": [4, 3], "x": 9.5, "y": 0},
+
+        {"matrix": [4, 1], "x": 11, "y": 0},
+        {"matrix": [7, 1], "x": 12, "y": 0},
+        {"matrix": [6, 1], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [7, 2], "x": 15.25, "y": 0},
+        {"matrix": [5, 2], "x": 16.25, "y": 0},
+        {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 9], "x": 0, "y": 1.5},
+        {"matrix": [7, 9], "x": 1, "y": 1.5},
+        {"matrix": [7, 8], "x": 2, "y": 1.5},
+        {"matrix": [7, 7], "x": 3, "y": 1.5},
+        {"matrix": [7, 6], "x": 4, "y": 1.5},
+        {"matrix": [4, 6], "x": 5, "y": 1.5},
+        {"matrix": [4, 5], "x": 6, "y": 1.5},
+        {"matrix": [7, 5], "x": 7, "y": 1.5},
+        {"matrix": [7, 4], "x": 8, "y": 1.5},
+        {"matrix": [7, 3], "x": 9, "y": 1.5},
+        {"matrix": [7, 17], "x": 10, "y": 1.5},
+        {"matrix": [4, 17], "x": 11, "y": 1.5},
+        {"matrix": [4, 4], "x": 12, "y": 1.5},
+        {"matrix": [2, 1], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [4, 11], "x": 15.25, "y": 1.5},
+        {"matrix": [4, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [4, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 10], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 11], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 16], "x": 20.5, "y": 1.5},
+        {"matrix": [0, 16], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 9], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [5, 9], "x": 1.5, "y": 2.5},
+        {"matrix": [5, 8], "x": 2.5, "y": 2.5},
+        {"matrix": [5, 7], "x": 3.5, "y": 2.5},
+        {"matrix": [5, 6], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 6.5, "y": 2.5},
+        {"matrix": [5, 5], "x": 7.5, "y": 2.5},
+        {"matrix": [5, 4], "x": 8.5, "y": 2.5},
+        {"matrix": [5, 3], "x": 9.5, "y": 2.5},
+        {"matrix": [5, 17], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 17], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 12.5, "y": 2.5},
+        {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [4, 10], "x": 15.25, "y": 2.5},
+        {"matrix": [7, 14], "x": 16.25, "y": 2.5},
+        {"matrix": [7, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [5, 10], "x": 18.5, "y": 2.5},
+        {"matrix": [5, 11], "x": 19.5, "y": 2.5},
+        {"matrix": [5, 16], "x": 20.5, "y": 2.5},
+        {"matrix": [5, 14], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [2, 8], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 9], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+        {"matrix": [6, 6], "x": 5.75, "y": 3.5},
+        {"matrix": [6, 5], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 17], "x": 10.75, "y": 3.5},
+        {"matrix": [6, 17], "x": 11.75, "y": 3.5},
+        {"matrix": [1, 1], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [2, 10], "x": 18.5, "y": 3.5},
+        {"matrix": [2, 11], "x": 19.5, "y": 3.5},
+        {"matrix": [2, 16], "x": 20.5, "y": 3.5},
+
+        {"matrix": [2, 13], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [1, 9], "x": 2.25, "y": 4.5},
+        {"matrix": [1, 8], "x": 3.25, "y": 4.5},
+        {"matrix": [1, 7], "x": 4.25, "y": 4.5},
+        {"matrix": [1, 6], "x": 5.25, "y": 4.5},
+        {"matrix": [0, 6], "x": 6.25, "y": 4.5},
+        {"matrix": [0, 5], "x": 7.25, "y": 4.5},
+        {"matrix": [1, 5], "x": 8.25, "y": 4.5},
+        {"matrix": [1, 4], "x": 9.25, "y": 4.5},
+        {"matrix": [1, 3], "x": 10.25, "y": 4.5},
+        {"matrix": [0, 17], "x": 11.25, "y": 4.5},
+        {"matrix": [3, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [6, 14], "x": 16.25, "y": 4.5},
+
+        {"matrix": [3, 10], "x": 18.5, "y": 4.5},
+        {"matrix": [3, 11], "x": 19.5, "y": 4.5},
+        {"matrix": [3, 16], "x": 20.5, "y": 4.5},
+        {"matrix": [3, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [2, 15], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [6, 10], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [0, 2], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [3, 12], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [0, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [1, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [0, 10], "x": 16.25, "y": 5.5},
+        {"matrix": [0, 11], "x": 17.25, "y": 5.5},
+
+        {"matrix": [6, 11], "x": 18.5, "y": 5.5, "w": 2},
+        {"matrix": [6, 16], "x": 20.5, "y": 5.5}
+      ]
     }
   }
 }
diff --git a/keyboards/bpiphany/tiger_lily/tiger_lily.h b/keyboards/bpiphany/tiger_lily/tiger_lily.h
deleted file mode 100644
index b1a872e215..0000000000
--- a/keyboards/bpiphany/tiger_lily/tiger_lily.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-
-/*
-  Matrix col/row mapping
-
-  ,----.    ,-------------------. ,-------------------. ,-------------------. ,--------------.
-  | J6 |    | I4 | H4 | H2 | H6 | | A7 | E6 | D2 | D4 | | B4 | B7 | B6 | B0 | | C7 | C5 | A5 |
-  `----'    `-------------------' `-------------------' `-------------------' `--------------'
-  ,-------------------------------------------------------------------------. ,--------------. ,-------------------.
-  | J4 | J7 | I7 | H7 | G7 | G4 | F4 | F7 | E7 | D7 | R7 | R4 | E4 |     B2 | | L4 | O4 | Q4 | | K1 | L1 | Q1 | Q0 |
-  |-------------------------------------------------------------------------| |--------------| |-------------------|
-  | J2   | J5 | I5 | H5 | G5 | G2 | F2 | F5 | E5 | D5 | R5 | R2 | E2 |   B3 | | K4 | O7 | Q7 | | K5 | L5 | Q5 | O5 |
-  |-------------------------------------------------------------------------| '--------------' |--------------     |
-  | O5    | J3 | I3 | H3 | G3 | G6 | F6 | F3 | E3 | D3 | R3 | R6 |       B1 |                  | K2 | L2 | Q2 |    |
-  |-------------------------------------------------------------------------|      ,----.      |-------------------|
-  | N2      | J1 | I1 | H1 | G1 | G0 | F0 | F1 | E1 | D1 | R0 |          N3 |      | O6 |      | K3 | L3 | Q3 | O3 |
-  |-------------------------------------------------------------------------| ,--------------. |--------------     |
-  | A4 | P2 | C6 |                  K6                  | C0 | M3 | D0 | A1 | | O0 | K0 | L0 | | L6      | Q6 |    |
-  `-------------------------------------------------------------------------' `--------------' `-------------------'
-*/
-#define LAYOUT( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2, KI6, KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, KI6, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    KJ6,      KI4, KH4, KH2, KH6, KA7, KE6, KD2, KD4, KB4, KB7, KB6, KB0,   KC7, KC5, KA5, \
-    KJ4, KJ7, KI7, KH7, KG7, KG4, KF4, KF7, KE7, KD7, KR7, KR4, KE4, KB2,   KL4, KO4, KQ4,   KK1, KL1, KQ1, KQ0, \
-    KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7,   KK5, KL5, KQ5, KO5, \
-    KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                    KK2, KL2, KQ2, \
-    KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,        KK3, KL3, KQ3, KO3, \
-    KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0,   KL6,      KQ6 \
-) { \
-    { XXX, KB0, KC0, KD0, XXX, KF0, KG0, XXX, XXX, XXX, KK0, KL0, XXX, XXX, KO0, XXX, KQ0, KR0 }, \
-    { KA1, KB1, XXX, KD1, KE1, KF1, KG1, KH1, KI1, KJ1, KK1, KL1, XXX, XXX, XXX, XXX, KQ1, XXX }, \
-    { XXX, KB2, XXX, KD2, KE2, KF2, KG2, KH2, KI2, KJ2, KK2, KL2, XXX, KN2, XXX, KP2, KQ2, KR2 }, \
-    { XXX, KB3, XXX, KD3, KE3, KF3, KG3, KH3, KI3, KJ3, KK3, KL3, KM3, KN3, KO3, XXX, KQ3, KR3 }, \
-    { KA4, KB4, XXX, KD4, KE4, KF4, KG4, KH4, KI4, KJ4, KK4, KL4, XXX, XXX, KO4, XXX, KQ4, KR4 }, \
-    { KA5, XXX, KC5, KD5, KE5, KF5, KG5, KH5, KI5, KJ5, KK5, KL5, XXX, XXX, KO5, XXX, KQ5, KR5 }, \
-    { XXX, KB6, KC6, XXX, KE6, KF6, KG6, KH6, XXX, KJ6, KK6, KL6, XXX, XXX, KO6, XXX, KQ6, KR6 }, \
-    { KA7, KB7, KC7, KD7, KE7, KF7, KG7, KH7, KI7, KJ7, XXX, XXX, XXX, XXX, KO7, XXX, KQ7, KR7 } \
-}
diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json
index 8e4a28ab46..2f3e8913c5 100644
--- a/keyboards/converter/usb_usb/info.json
+++ b/keyboards/converter/usb_usb/info.json
@@ -13,550 +13,560 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [6, 8], "x": 2, "y": 0},
+                {"matrix": [6, 9], "x": 3, "y": 0},
+                {"matrix": [6, 10], "x": 4, "y": 0},
+                {"matrix": [6, 11], "x": 5, "y": 0},
 
-                {"x": 0, "y": 1},
+                {"matrix": [6, 12], "x": 6.5, "y": 0},
+                {"matrix": [6, 13], "x": 7.5, "y": 0},
+                {"matrix": [6, 14], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
 
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1},
-                {"x": 14, "y": 1},
+                {"matrix": [7, 0], "x": 11, "y": 0},
+                {"matrix": [7, 1], "x": 12, "y": 0},
+                {"matrix": [7, 2], "x": 13, "y": 0},
+                {"matrix": [7, 3], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 1},
-                {"x": 16.25, "y": 1},
-                {"x": 17.25, "y": 1},
+                {"matrix": [2, 9], "x": 0, "y": 1},
 
-                {"x": 18.5, "y": 1},
-                {"x": 19.5, "y": 1},
-                {"x": 20.5, "y": 1},
-                {"x": 21.5, "y": 1},
+                {"matrix": [3, 10], "x": 2, "y": 1},
+                {"matrix": [3, 11], "x": 3, "y": 1},
+                {"matrix": [3, 12], "x": 4, "y": 1},
+                {"matrix": [3, 13], "x": 5, "y": 1},
 
-                {"x": 22.75, "y": 1},
+                {"matrix": [3, 14], "x": 6.5, "y": 1},
+                {"matrix": [3, 15], "x": 7.5, "y": 1},
+                {"matrix": [4, 0], "x": 8.5, "y": 1},
+                {"matrix": [4, 1], "x": 9.5, "y": 1},
 
-                {"x": 0, "y": 2.5},
-                {"x": 1, "y": 2.5},
-                {"x": 2, "y": 2.5},
-                {"x": 3, "y": 2.5},
-                {"x": 4, "y": 2.5},
-                {"x": 5, "y": 2.5},
-                {"x": 6, "y": 2.5},
-                {"x": 7, "y": 2.5},
-                {"x": 8, "y": 2.5},
-                {"x": 9, "y": 2.5},
-                {"x": 10, "y": 2.5},
-                {"x": 11, "y": 2.5},
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.5},
-                {"x": 14, "y": 2.5},
+                {"matrix": [4, 2], "x": 11, "y": 1},
+                {"matrix": [4, 3], "x": 12, "y": 1},
+                {"matrix": [4, 4], "x": 13, "y": 1},
+                {"matrix": [4, 5], "x": 14, "y": 1},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [4, 6], "x": 15.25, "y": 1},
+                {"matrix": [4, 7], "x": 16.25, "y": 1},
+                {"matrix": [4, 8], "x": 17.25, "y": 1},
 
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 18.5, "y": 1},
+                {"matrix": [8, 0], "x": 19.5, "y": 1},
+                {"matrix": [7, 15], "x": 20.5, "y": 1},
+                {"matrix": [6, 6], "x": 21.5, "y": 1},
 
-                {"x": 22.75, "y": 2.5},
-                {"x": 23.75, "y": 2.5},
+                {"matrix": [7, 5], "x": 22.75, "y": 1},
 
-                {"x": 0, "y": 3.5, "w": 1.5},
-                {"x": 1.5, "y": 3.5},
-                {"x": 2.5, "y": 3.5},
-                {"x": 3.5, "y": 3.5},
-                {"x": 4.5, "y": 3.5},
-                {"x": 5.5, "y": 3.5},
-                {"x": 6.5, "y": 3.5},
-                {"x": 7.5, "y": 3.5},
-                {"x": 8.5, "y": 3.5},
-                {"x": 9.5, "y": 3.5},
-                {"x": 10.5, "y": 3.5},
-                {"x": 11.5, "y": 3.5},
-                {"x": 12.5, "y": 3.5},
-                {"x": 13.5, "y": 3.5, "w": 1.5},
+                {"matrix": [3, 5], "x": 0, "y": 2.5},
+                {"matrix": [1, 14], "x": 1, "y": 2.5},
+                {"matrix": [1, 15], "x": 2, "y": 2.5},
+                {"matrix": [2, 0], "x": 3, "y": 2.5},
+                {"matrix": [2, 1], "x": 4, "y": 2.5},
+                {"matrix": [2, 2], "x": 5, "y": 2.5},
+                {"matrix": [2, 3], "x": 6, "y": 2.5},
+                {"matrix": [2, 4], "x": 7, "y": 2.5},
+                {"matrix": [2, 5], "x": 8, "y": 2.5},
+                {"matrix": [2, 6], "x": 9, "y": 2.5},
+                {"matrix": [2, 7], "x": 10, "y": 2.5},
+                {"matrix": [2, 13], "x": 11, "y": 2.5},
+                {"matrix": [2, 14], "x": 12, "y": 2.5},
+                {"matrix": [8, 9], "x": 13, "y": 2.5},
+                {"matrix": [2, 10], "x": 14, "y": 2.5},
 
-                {"x": 15.25, "y": 3.5},
-                {"x": 16.25, "y": 3.5},
-                {"x": 17.25, "y": 3.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 2.5},
 
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
-                {"x": 21.5, "y": 3.5},
+                {"matrix": [5, 3], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 2.5},
 
-                {"x": 22.75, "y": 3.5},
-                {"x": 23.75, "y": 3.5},
+                {"matrix": [7, 8], "x": 22.75, "y": 2.5},
+                {"matrix": [7, 9], "x": 23.75, "y": 2.5},
 
-                {"x": 0, "y": 4.5, "w": 1.75},
-                {"x": 1.75, "y": 4.5},
-                {"x": 2.75, "y": 4.5},
-                {"x": 3.75, "y": 4.5},
-                {"x": 4.75, "y": 4.5},
-                {"x": 5.75, "y": 4.5},
-                {"x": 6.75, "y": 4.5},
-                {"x": 7.75, "y": 4.5},
-                {"x": 8.75, "y": 4.5},
-                {"x": 9.75, "y": 4.5},
-                {"x": 10.75, "y": 4.5},
-                {"x": 11.75, "y": 4.5},
-                {"x": 12.75, "y": 4.5},
-                {"x": 13.75, "y": 4.5, "w": 1.25},
+                {"matrix": [2, 11], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 3.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 3.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 3.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 3.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 3.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 3.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 3.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 3.5, "w": 1.5},
 
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5},
+                {"matrix": [4, 12], "x": 15.25, "y": 3.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 3.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 3.5},
 
-                {"x": 22.75, "y": 4.5},
-                {"x": 23.75, "y": 4.5},
+                {"matrix": [5, 15], "x": 18.5, "y": 3.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 3.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 3.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 3.5},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5},
-                {"x": 2.25, "y": 5.5},
-                {"x": 3.25, "y": 5.5},
-                {"x": 4.25, "y": 5.5},
-                {"x": 5.25, "y": 5.5},
-                {"x": 6.25, "y": 5.5},
-                {"x": 7.25, "y": 5.5},
-                {"x": 8.25, "y": 5.5},
-                {"x": 9.25, "y": 5.5},
-                {"x": 10.25, "y": 5.5},
-                {"x": 11.25, "y": 5.5},
-                {"x": 12.25, "y": 5.5},
-                {"x": 13.25, "y": 5.5, "w": 1.75},
+                {"matrix": [7, 6], "x": 22.75, "y": 3.5},
+                {"matrix": [7, 10], "x": 23.75, "y": 3.5},
 
-                {"x": 16.25, "y": 5.5},
+                {"matrix": [3, 9], "x": 0, "y": 4.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 4.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 4.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 4.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 4.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 4.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 4.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 4.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 4.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 4.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 4.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 4.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 4.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 4.5, "w": 1.25},
 
-                {"x": 18.5, "y": 5.5},
-                {"x": 19.5, "y": 5.5},
-                {"x": 20.5, "y": 5.5},
-                {"x": 21.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 4.5},
+                {"matrix": [8, 5], "x": 21.5, "y": 4.5},
 
-                {"x": 22.75, "y": 5.5},
-                {"x": 23.75, "y": 5.5},
+                {"matrix": [7, 7], "x": 22.75, "y": 4.5},
+                {"matrix": [7, 12], "x": 23.75, "y": 4.5},
 
-                {"x": 0, "y": 6.5},
-                {"x": 1, "y": 6.5},
-                {"x": 2, "y": 6.5},
-                {"x": 3, "y": 6.5},
-                {"x": 4, "y": 6.5},
-                {"x": 5, "y": 6.5, "w": 3},
-                {"x": 8, "y": 6.5},
-                {"x": 9, "y": 6.5},
-                {"x": 10, "y": 6.5},
-                {"x": 11, "y": 6.5},
-                {"x": 12, "y": 6.5},
-                {"x": 13, "y": 6.5},
-                {"x": 14, "y": 6.5},
+                {"matrix": [14, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 5.5},
+                {"matrix": [1, 13], "x": 2.25, "y": 5.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 5.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 5.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 5.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 5.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 5.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 5.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 5.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 5.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 12.25, "y": 5.5},
+                {"matrix": [14, 5], "x": 13.25, "y": 5.5, "w": 1.75},
 
-                {"x": 15.25, "y": 6.5},
-                {"x": 16.25, "y": 6.5},
-                {"x": 17.25, "y": 6.5},
+                {"matrix": [5, 2], "x": 16.25, "y": 5.5},
 
-                {"x": 18.5, "y": 6.5, "w": 2},
-                {"x": 20.5, "y": 6.5},
-                {"x": 21.5, "y": 6.5},
+                {"matrix": [5, 9], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 5.5},
 
-                {"x": 22.75, "y": 6.5},
-                {"x": 23.75, "y": 6.5}
+                {"matrix": [7, 4], "x": 22.75, "y": 5.5},
+                {"matrix": [7, 13], "x": 23.75, "y": 5.5},
+
+                {"matrix": [14, 0], "x": 0, "y": 6.5},
+                {"matrix": [14, 3], "x": 1, "y": 6.5},
+                {"matrix": [14, 2], "x": 2, "y": 6.5},
+                {"matrix": [8, 11], "x": 3, "y": 6.5},
+                {"matrix": [9, 1], "x": 4, "y": 6.5},
+                {"matrix": [2, 12], "x": 5, "y": 6.5, "w": 3},
+                {"matrix": [9, 0], "x": 8, "y": 6.5},
+                {"matrix": [8, 10], "x": 9, "y": 6.5},
+                {"matrix": [8, 8], "x": 10, "y": 6.5},
+                {"matrix": [14, 6], "x": 11, "y": 6.5},
+                {"matrix": [14, 7], "x": 12, "y": 6.5},
+                {"matrix": [6, 5], "x": 13, "y": 6.5},
+                {"matrix": [14, 4], "x": 14, "y": 6.5},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 6.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 6.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 6.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 6.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 6.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 6.5},
+
+                {"matrix": [7, 14], "x": 22.75, "y": 6.5},
+                {"matrix": [7, 11], "x": 23.75, "y": 6.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [2, 9], "x": 0, "y": 0},
 
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
 
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
-                {"x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
 
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
 
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
 
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
 
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [2, 9], "x": 0, "y": 0},
 
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
 
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
 
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
 
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"x": 0, "y": 4.5, "w": 1.25},
-                {"x": 1.25, "y": 4.5},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
 
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 6.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
 
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_jis": {
             "layout": [
-                {"x": 0, "y": 0},
+                {"matrix": [2, 9], "x": 0, "y": 0},
 
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"matrix": [3, 10], "x": 2, "y": 0},
+                {"matrix": [3, 11], "x": 3, "y": 0},
+                {"matrix": [3, 12], "x": 4, "y": 0},
+                {"matrix": [3, 13], "x": 5, "y": 0},
 
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
+                {"matrix": [3, 14], "x": 6.5, "y": 0},
+                {"matrix": [3, 15], "x": 7.5, "y": 0},
+                {"matrix": [4, 0], "x": 8.5, "y": 0},
+                {"matrix": [4, 1], "x": 9.5, "y": 0},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.5},
-                {"x": 3, "y": 1.5},
-                {"x": 4, "y": 1.5},
-                {"x": 5, "y": 1.5},
-                {"x": 6, "y": 1.5},
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.5},
-                {"x": 9, "y": 1.5},
-                {"x": 10, "y": 1.5},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5},
-                {"x": 14, "y": 1.5},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0},
+                {"matrix": [4, 5], "x": 14, "y": 0},
 
-                {"x": 15.25, "y": 1.5},
-                {"x": 16.25, "y": 1.5},
-                {"x": 17.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 15.25, "y": 0},
+                {"matrix": [4, 7], "x": 16.25, "y": 0},
+                {"matrix": [4, 8], "x": 17.25, "y": 0},
 
-                {"x": 18.5, "y": 1.5},
-                {"x": 19.5, "y": 1.5},
-                {"x": 20.5, "y": 1.5},
-                {"x": 21.5, "y": 1.5},
+                {"matrix": [3, 5], "x": 0, "y": 1.5},
+                {"matrix": [1, 14], "x": 1, "y": 1.5},
+                {"matrix": [1, 15], "x": 2, "y": 1.5},
+                {"matrix": [2, 0], "x": 3, "y": 1.5},
+                {"matrix": [2, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 2], "x": 5, "y": 1.5},
+                {"matrix": [2, 3], "x": 6, "y": 1.5},
+                {"matrix": [2, 4], "x": 7, "y": 1.5},
+                {"matrix": [2, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 6], "x": 9, "y": 1.5},
+                {"matrix": [2, 7], "x": 10, "y": 1.5},
+                {"matrix": [2, 13], "x": 11, "y": 1.5},
+                {"matrix": [2, 14], "x": 12, "y": 1.5},
+                {"matrix": [8, 9], "x": 13, "y": 1.5},
+                {"matrix": [2, 10], "x": 14, "y": 1.5},
 
-                {"x": 0, "y": 2.5, "w": 1.5},
-                {"x": 1.5, "y": 2.5},
-                {"x": 2.5, "y": 2.5},
-                {"x": 3.5, "y": 2.5},
-                {"x": 4.5, "y": 2.5},
-                {"x": 5.5, "y": 2.5},
-                {"x": 6.5, "y": 2.5},
-                {"x": 7.5, "y": 2.5},
-                {"x": 8.5, "y": 2.5},
-                {"x": 9.5, "y": 2.5},
-                {"x": 10.5, "y": 2.5},
-                {"x": 11.5, "y": 2.5},
-                {"x": 12.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 10], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 11], "x": 17.25, "y": 1.5},
 
-                {"x": 15.25, "y": 2.5},
-                {"x": 16.25, "y": 2.5},
-                {"x": 17.25, "y": 2.5},
+                {"matrix": [5, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [5, 4], "x": 19.5, "y": 1.5},
+                {"matrix": [5, 5], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
 
-                {"x": 18.5, "y": 2.5},
-                {"x": 19.5, "y": 2.5},
-                {"x": 20.5, "y": 2.5},
-                {"x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 4], "x": 1.5, "y": 2.5},
+                {"matrix": [1, 10], "x": 2.5, "y": 2.5},
+                {"matrix": [0, 8], "x": 3.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 12], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [0, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 9.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 12.5, "y": 2.5},
 
-                {"x": 0, "y": 3.5, "w": 1.75},
-                {"x": 1.75, "y": 3.5},
-                {"x": 2.75, "y": 3.5},
-                {"x": 3.75, "y": 3.5},
-                {"x": 4.75, "y": 3.5},
-                {"x": 5.75, "y": 3.5},
-                {"x": 6.75, "y": 3.5},
-                {"x": 7.75, "y": 3.5},
-                {"x": 8.75, "y": 3.5},
-                {"x": 9.75, "y": 3.5},
-                {"x": 10.75, "y": 3.5},
-                {"x": 11.75, "y": 3.5},
-                {"x": 12.75, "y": 3.5},
-                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [4, 12], "x": 15.25, "y": 2.5},
+                {"matrix": [4, 13], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
 
-                {"x": 18.5, "y": 3.5},
-                {"x": 19.5, "y": 3.5},
-                {"x": 20.5, "y": 3.5},
+                {"matrix": [5, 15], "x": 18.5, "y": 2.5},
+                {"matrix": [6, 0], "x": 19.5, "y": 2.5},
+                {"matrix": [6, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"x": 0, "y": 4.5, "w": 2.25},
-                {"x": 2.25, "y": 4.5},
-                {"x": 3.25, "y": 4.5},
-                {"x": 4.25, "y": 4.5},
-                {"x": 5.25, "y": 4.5},
-                {"x": 6.25, "y": 4.5},
-                {"x": 7.25, "y": 4.5},
-                {"x": 8.25, "y": 4.5},
-                {"x": 9.25, "y": 4.5},
-                {"x": 10.25, "y": 4.5},
-                {"x": 11.25, "y": 4.5},
-                {"x": 12.25, "y": 4.5},
-                {"x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [0, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 2.75, "y": 3.5},
+                {"matrix": [0, 7], "x": 3.75, "y": 3.5},
+                {"matrix": [0, 9], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 11], "x": 6.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 7.75, "y": 3.5},
+                {"matrix": [0, 14], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [5, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [5, 14], "x": 20.5, "y": 3.5},
 
-                {"x": 18.5, "y": 4.5},
-                {"x": 19.5, "y": 4.5},
-                {"x": 20.5, "y": 4.5},
-                {"x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [1, 13], "x": 2.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 3.25, "y": 4.5},
+                {"matrix": [0, 6], "x": 4.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 5.25, "y": 4.5},
+                {"matrix": [0, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [1, 1], "x": 7.25, "y": 4.5},
+                {"matrix": [1, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [3, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [3, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [3, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [8, 7], "x": 12.25, "y": 4.5},
+                {"matrix": [14, 5], "x": 13.25, "y": 4.5, "w": 1.75},
 
-                {"x": 0, "y": 5.5, "w": 1.25},
-                {"x": 1.25, "y": 5.5, "w": 1.25},
-                {"x": 2.5, "y": 5.5, "w": 1.25},
-                {"x": 3.75, "y": 5.5, "w": 1.25},
-                {"x": 5, "y": 5.5, "w": 2.5},
-                {"x": 7.5, "y": 5.5, "w": 1.25},
-                {"x": 8.75, "y": 5.5, "w": 1.25},
-                {"x": 10, "y": 5.5, "w": 1.25},
-                {"x": 11.25, "y": 5.5, "w": 1.25},
-                {"x": 12.5, "y": 5.5, "w": 1.25},
-                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 16.25, "y": 4.5},
 
-                {"x": 15.25, "y": 5.5},
-                {"x": 16.25, "y": 5.5},
-                {"x": 17.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2},
 
-                {"x": 18.5, "y": 5.5, "w": 2},
-                {"x": 20.5, "y": 5.5}
+                {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 11], "x": 3.75, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 12], "x": 5, "y": 5.5, "w": 2.5},
+                {"matrix": [8, 10], "x": 7.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 8], "x": 8.75, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 0], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 1], "x": 16.25, "y": 5.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [6, 3], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
index 76cf311462..d34f91d21e 100644
--- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c
@@ -87,12 +87,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_SUPERDUPER] = LAYOUT_fullsize_ansi(
-        ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,  ______,               ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     ______,    ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  KC_LALT, ______,  ______,  KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,        KC_RIGHT,   KC_DEL,    ______,                    ______,                                    ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,       ______,     TG(_SUPERDUPER),                      ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,  ______,                    KC_LSFT,                                                        ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,          _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______, _______,              _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    _______,   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, C(KC_1), C(S(KC_TAB)), C(KC_TAB),  C(KC_9),   _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, KC_LALT, _______, _______, KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP,        KC_RIGHT,   KC_DEL,    _______,                   _______,                                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,    TG(_SUPERDUPER),                      _______,              _______,             _______, _______, _______, _______,
+        _______, _______, _______,                   KC_LSFT,                                                        _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     ),
 
     /* Dev
@@ -112,12 +112,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------' `---------------'
     */
     [_DEV] = LAYOUT_fullsize_ansi(
-        ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                            ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                        ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  ______,  ______,                     ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  ______,                       ______,                                    ______,  ______,  ______,
-        ______,  ______,  ______,  ______,  ______,  ______,  KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                             ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,  ______,                    ______,                                                            ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                       _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0),  _______, _______,                    _______,     _______, _______, _______,    _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC),  _______,                      _______,                                   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH),                               _______,              _______,             _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                                                           _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     ),
 
     /* Adjust
@@ -137,12 +137,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `-----------------------------------------------------------' `-----------'    `---------------'
     */
     [_ADJUST] = LAYOUT_fullsize_ansi(
-        ______,                ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
-        ______,  ______,       ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MPLY, KC_MNXT, KC_VOLU,    ______,  ______,  ______,  ______,
-        ______,  DF(_QWERTY),  ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      KC_MSTP, KC_MPRV, KC_VOLD,    ______,  ______,  ______,  ______,
-        ______,  ______,       ______,  ______,    ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                    ______,                                    ______,  ______,  ______,
-        ______,  ______,       ______,  DF(_CKO),  ______,  ______,  KC_MPLY,  KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER),                   ______,               ______,              ______,  ______,  ______,  ______,
-        ______,  ______,       ______,                      ______,                                               ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+        _______,               _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MPLY, KC_MNXT, KC_VOLU,    _______, _______, _______, _______,
+        _______, DF(_QWERTY),  _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     KC_MSTP, KC_MPRV, KC_VOLD,    _______, _______, _______, _______,
+        _______, _______,      _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
+        _______, _______,      _______, DF(_CKO),  _______, _______, KC_MPLY,  KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER),                   _______,              _______,             _______, _______, _______, _______,
+        _______, _______,      _______,                     _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
     )
 
 /* Empty layout for future reference
@@ -163,12 +163,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  /*
   *  [_EMPTY] = LAYOUT_fullsize_ansi(
-  *      ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,               ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,           ______,      ______,  ______,  ______,     ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                    ______,                                    ______,  ______,  ______,
-  *      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,                             ______,               ______,              ______,  ______,  ______,  ______,
-  *      ______,  ______,  ______,                    ______,                                               ______,  ______,  ______,  ______,      ______,  ______,  ______,     ______,           ______
+  *      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     _______, _______, _______,    _______, _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,                                   _______, _______, _______,
+  *      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,              _______,             _______, _______, _______, _______,
+  *      _______, _______, _______,                   _______,                                              _______, _______, _______, _______,     _______, _______, _______,    _______,          _______
   *  ),
  */
 };
diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
index fc9ebfa15d..67e1075654 100644
--- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c
@@ -55,13 +55,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    KC_GRV,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT, ______, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______, ______,   ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______, ______,   ______,         ______,           ______, ______,  ______, ______, ______, ______, QK_BOOT,    ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,   _______, _______, _______, _______,   _______,
+    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
+    KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,    _______, _______, _______,   _______, _______, _______, _______,   _______, _______,
+    _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______, _______,                                 _______, _______, _______, _______,   _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,             _______,            _______, _______, _______, _______,   _______, _______,
+    _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______,   _______,          _______, _______,   _______, _______
     ),
 };
 
diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c
index 51a7a179af..36d5cd8780 100644
--- a/keyboards/converter/usb_usb/keymaps/default/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c
@@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [1] = LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    ______,           ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______,         ______,           ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______,    _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,    _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  _______, _______, _______,    _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,                                _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,           _______,             _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,    _______,          _______, _______,    _______, _______
     ),
 };
diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
index 78faa7975e..7b1b0ec445 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c
@@ -76,13 +76,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2,         KC_SPC,         KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
     ),
     [_SUPERDUPER] = LAYOUT_all(
-                      ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,
-    QK_BOOT,          ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______,             ______,______,______,    ______,______,______,______,    ______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  BRWS_L, BRWS_R, ______, ______, ______,         ______,     ______,______,______,    ______,______,______,______,    ______,______,
-    KC_SPC, KC_LALT, _______, _______, KC_BSPC,KC_LGUI,KC_LEFT, KC_DOWN,   KC_UP,KC_RGHT,  KC_DEL, ______,         ______, ______,                              ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______, ______, ______,  ______,  ______, ______,  ______, ______,         ______, ______,            ______,           ______,______,______,______,    ______,______,
-    ______,  ______,  ______,  ______,  ______,         KC_LSFT,           ______, ______,  ______, ______, ______, ______, ______,     ______,______,______,    ______,       ______,______,    ______,______
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    QK_BOOT,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,   _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, BRWS_L,  BRWS_R,  _______, _______, _______,          _______,    _______, _______, _______,   _______, _______, _______, _______,    _______, _______,
+    KC_SPC,  KC_LALT, _______, _______, KC_BSPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_DEL,  _______,          _______, _______,                                 _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,             _______,            _______, _______, _______, _______,    _______, _______,
+    _______, _______, _______, _______, _______,          KC_LSFT,          _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,   _______,          _______, _______,    _______, _______
     ),
 };
 
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h
deleted file mode 100644
index 87f70bc07a..0000000000
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define ______ KC_TRNS
-
-/*         ,---------------. ,---------------. ,---------------.
- *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
- * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
- * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
- * |-----------------------------------------------------------| |-----------| |---------------| |-------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
- * |-----------------------------------------------------------| `-----------' |---------------| |-------|
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
- * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
- * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
- * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
- * `-----------------------------------------------------------' `-----------' `---------------' `-------'
- *
- *
- * App:         Windows Menu key
- * Gui:         Windows key, Mac ⌘ key or Meta key
- *
- * Pwr:         Power for Unix and Mac
- * VDn,Vup,Mut: Volume control for Unix and Mac
- * Stp,Agn..:   for Unix
- *
- * KP,:         Brazilian Keypad Comma
- * KP=:         Keypad = for Mac
- * <,#:         ISO keys(UK legend)
- * JPY:         Japanese Yen(￥)
- * RO:          Japanese ろ or Brazilian /
- * MHEN:        Japanese 無変換 Non Conversion
- * HENK:        Japanese 変換 Conversion
- * KANA:        Japanese かな Hiragana/Katakana
- *              https://en.wikipedia.org/wiki/Keyboard_layout#Japanese
- * H/E:         Korean 한/영 Hangul/English
- * HNJ:         Korean 한자 Hanja
- *              https://en.wikipedia.org/wiki/Keyboard_layout#Hangul_.28for_Korean.29
- *
- * TODO: use same keycode to pass through instead of KC_NO?
- */
-#define LAYOUT_all( \
-              k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, k73, \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48,  k81, k80, k7F, k66,  k75, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56,  k78, k79, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,       k4C, k4D, k4E,  k5F, k60, k61, k57,  k76, k7A, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                       k5C, k5D, k5E, k85,  k77, k7C, \
-    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k67,  k74, k7D, \
-    kE0, kE3, kE2, k8B, k91,      k2C, k90, k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63, k58,  k7E, k7B \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F }, \
-    { k80, k81, XXX, XXX, XXX, k85, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \
-    { k90, k91, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +|
- * |-----------------------------------------------------------| `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return|               |  4|  5|  6|  +|
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|   |
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|Ent|
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_ansi( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31,  k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34,      k28,                  k5C, k5D, k5E, \
-    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2,                k2C,                kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Retn| |Del|End|PgD| |  7|  8|  9|  +|
- * |------------------------------------------------------`    | `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|    |               |  4|  5|  6|   |
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /|Shift     |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|           Space               |Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_iso( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,  k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30,       k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                  k5C, k5D, k5E, \
-    kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38,      kE5,       k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2,                k2C,                kE6, kE7, k65, kE4,  k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, k64, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
-
-/* ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------. ,---------------.
- * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  ^|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -|
- * |-----------------------------------------------------------| |-----------| |---------------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  @|  [| Retn| |Del|End|PgD| |  7|  8|  9|  +|
- * |------------------------------------------------------`    | `-----------' |-----------|   |
- * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  ]|    |               |  4|  5|  6|   |
- * |-----------------------------------------------------------|     ,---.     |---------------|
- * |Shft    |  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|Ent|
- * |-----------------------------------------------------------| ,-----------. |-----------|   |
- * |Ctl|Gui|Alt|MHEN|      Space      |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |      0|  .|   |
- * `-----------------------------------------------------------' `-----------' `---------------'
- */
-#define LAYOUT_fullsize_jis( \
-    k29,      k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45,       k46, k47, k48, \
-\
-    k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A,  k49, k4A, k4B,  k53, k54, k55, k56, \
-    k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30,            k4C, k4D, k4E,  k5F, k60, k61, k57, \
-    k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28,                       k5C, k5D, k5E, \
-    kE1,      k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5,            k52,       k59, k5A, k5B, k58, \
-    kE0, kE3, kE2, k8B,      k2C,           k8A, k88, kE6, kE7, k65, kE4,       k50, k51, k4F,  k62,      k63 \
-) { \
-    { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
-    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \
-    { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}
diff --git a/keyboards/durgod/k310/info.json b/keyboards/durgod/k310/info.json
index 30b944f33e..945c529679 100644
--- a/keyboards/durgod/k310/info.json
+++ b/keyboards/durgod/k310/info.json
@@ -12,344 +12,383 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "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 },
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                { "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 },
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                { "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 },
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                { "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 },
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
 
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "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 },
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.5 },
-                { "label": "W", "x": 2.5, "y": 2.5 },
-                { "label": "E", "x": 3.5, "y": 2.5 },
-                { "label": "R", "x": 4.5, "y": 2.5 },
-                { "label": "T", "x": 5.5, "y": 2.5 },
-                { "label": "Y", "x": 6.5, "y": 2.5 },
-                { "label": "U", "x": 7.5, "y": 2.5 },
-                { "label": "I", "x": 8.5, "y": 2.5 },
-                { "label": "O", "x": 9.5, "y": 2.5 },
-                { "label": "P", "x": 10.5, "y": 2.5 },
-                { "label": "{", "x": 11.5, "y": 2.5 },
-                { "label": "}", "x": 12.5, "y": 2.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.5 },
-                { "label": "End", "x": 16.25, "y": 2.5 },
-                { "label": "PgDn", "x": 17.25, "y": 2.5 },
-                { "label": "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 },
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 2.5, "w": 1.25, "h": 2 },
-                { "label": "4", "x": 18.5, "y": 3.5 },
-                { "label": "5", "x": 19.5, "y": 3.5 },
-                { "label": "6", "x": 20.5, "y": 3.5 },
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 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 },
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
 
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "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 },
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                { "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 },
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.5 },
-                { "label": "S", "x": 2.75, "y": 3.5 },
-                { "label": "D", "x": 3.75, "y": 3.5 },
-                { "label": "F", "x": 4.75, "y": 3.5 },
-                { "label": "G", "x": 5.75, "y": 3.5 },
-                { "label": "H", "x": 6.75, "y": 3.5 },
-                { "label": "J", "x": 7.75, "y": 3.5 },
-                { "label": "K", "x": 8.75, "y": 3.5 },
-                { "label": "L", "x": 9.75, "y": 3.5 },
-                { "label": ":", "x": 10.75, "y": 3.5 },
-                { "label": "\"", "x": 11.75, "y": 3.5 },
-                { "label": "#", "x": 12.75, "y": 3.5 },
-                { "label": "Enter", "x": 13.75, "y": 3.5, "w": 1.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 },
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                { "label": "Shift", "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "\\", "x": 1.25, "y": 4.5 },
-                { "label": "Z", "x": 2.25, "y": 4.5 },
-                { "label": "X", "x": 3.25, "y": 4.5 },
-                { "label": "C", "x": 4.25, "y": 4.5 },
-                { "label": "V", "x": 5.25, "y": 4.5 },
-                { "label": "B", "x": 6.25, "y": 4.5 },
-                { "label": "N", "x": 7.25, "y": 4.5 },
-                { "label": "M", "x": 8.25, "y": 4.5 },
-                { "label": "<", "x": 9.25, "y": 4.5 },
-                { "label": ">", "x": 10.25, "y": 4.5 },
-                { "label": "?", "x": 11.25, "y": 4.5 },
-                { "label": "Shift", "x": 12.25, "y": 4.5, "w": 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 },
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
 
-                { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
-                { "x": 3.75, "y": 5.5, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
-                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.5 },
-                { "label": "\u2193", "x": 16.25, "y": 5.5 },
-                { "label": "\u2192", "x": 17.25, "y": 5.5 },
-                { "label": "0", "x": 18.5, "y": 5.5, "w": 2 },
-                { "label": ".", "x": 20.5, "y": 5.5 }
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 10], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 8], "x": 20.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [3, 13], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 15], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 10], "x": 18.5, "y": 2.5},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [7, 8], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 11], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 14], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [7, 14], "x": 18.5, "y": 3.5},
+                {"matrix": [7, 13], "x": 19.5, "y": 3.5},
+                {"matrix": [7, 12], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 14], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 13], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 12], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 11], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+                {"matrix": [6, 15], "x": 17.25, "y": 5.5},
+
+                {"matrix": [7, 15], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [7, 7], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/durgod/k310/k310.h b/keyboards/durgod/k310/k310.h
index 94c582a452..ee31903bfa 100644
--- a/keyboards/durgod/k310/k310.h
+++ b/keyboards/durgod/k310/k310.h
@@ -19,65 +19,6 @@
 
 #include "quantum.h"
 
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_fullsize_ansi( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,        K4E,                            K7E, K7D, K7C,      \
-      K40,        K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  XXX,  K3D,  K3E,  K3F },  \
-    { K40,  XXX,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_fullsize_iso( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,            K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                            K7E, K7D, K7C,      \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  XXX,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
-// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
-      K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,      K0D,  K0E,  K0F,                          \
-      K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1E,      K2E,  K2F,  K1F,      K6A, K69, K68, K67, \
-      K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,      K3D,  K3E,  K3F,      K7A, K79, K78, K6B, \
-      K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K4E,                            K7E, K7D, K7C,      \
-      K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,        K4D,            K4F,            K6E, K6D, K6C, K7B, \
-      K50,  K51,  K52,                    K56,                    K5A,  K5B,  K5C,  K5D,      K5E,  K5F,  K6F,      K7F,      K77       \
-) { \
-    { K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K0E,  K0F },  \
-    { K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  XXX,  K1E,  K1F },  \
-    { K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,  K2E,  K2F },  \
-    { K30,  K31,  K32,  K33,  K34,  K35,  K36,  K37,  K38,  K39,  K3A,  K3B,  K3C,  K3D,  K3E,  K3F },  \
-    { K40,  K41,  K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K4A,  K4B,  XXX,  K4D,  K4E,  K4F },  \
-    { K50,  K51,  K52,  XXX,  XXX,  XXX,  K56,  XXX,  XXX,  XXX,  K5A,  K5B,  K5C,  K5D,  K5E,  K5F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K67,  K68,  K69,  K6A,  K6B,  K6C,  K6D,  K6E,  K6F },  \
-    { XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  XXX,  K77,  K78,  K79,  K7A,  K7B,  K7C,  K7D,  K7E,  K7F }   \
-}
-
 /* Function Prototype */
 void off_all_leds(void);
 void on_all_leds(void);
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index 59516f2325..f044efff66 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/info.json
@@ -38,576 +38,591 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
 
-                {"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},
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.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},
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"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},
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
 
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
 
-                {"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},
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.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},
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.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},
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"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},
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
 
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "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},
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
 
-                {"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},
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.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},
+                {"matrix": [6, 9], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 21.5, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
 
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"matrix": [5, 9], "x": 18.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"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},
+                {"matrix": [3, 9], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 20.5, "y": 3.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
 
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [1, 9], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 12], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 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},
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.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},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 13], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [4, 4], "x": 2, "y": 0},
+                {"matrix": [4, 2], "x": 3, "y": 0},
+                {"matrix": [3, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "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},
+                {"matrix": [2, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 10], "x": 7.5, "y": 0},
+                {"matrix": [3, 14], "x": 8.5, "y": 0},
+                {"matrix": [4, 14], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [4, 13], "x": 11, "y": 0},
+                {"matrix": [2, 13], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [7, 13], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [2, 3], "x": 15.25, "y": 0},
+                {"matrix": [5, 3], "x": 16.25, "y": 0},
+                {"matrix": [5, 1], "x": 17.25, "y": 0},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [4, 5], "x": 0, "y": 1.5},
+                {"matrix": [2, 5], "x": 1, "y": 1.5},
+                {"matrix": [2, 4], "x": 2, "y": 1.5},
+                {"matrix": [2, 2], "x": 3, "y": 1.5},
+                {"matrix": [2, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 0], "x": 5, "y": 1.5},
+                {"matrix": [4, 8], "x": 6, "y": 1.5},
+                {"matrix": [2, 8], "x": 7, "y": 1.5},
+                {"matrix": [2, 10], "x": 8, "y": 1.5},
+                {"matrix": [2, 14], "x": 9, "y": 1.5},
+                {"matrix": [2, 15], "x": 10, "y": 1.5},
+                {"matrix": [4, 15], "x": 11, "y": 1.5},
+                {"matrix": [4, 10], "x": 12, "y": 1.5},
+                {"matrix": [3, 13], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"matrix": [4, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [4, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 6], "x": 17.25, "y": 1.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"matrix": [3, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [5, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [3, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 14], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 15], "x": 10.5, "y": 2.5},
+                {"matrix": [3, 15], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 10], "x": 12.5, "y": 2.5},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [4, 9], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [3, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 8], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 14], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 15], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [3, 11], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 9], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [7, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [3, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [7, 12], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 7], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wasdat/wasdat.h b/keyboards/evyd13/wasdat/wasdat.h
deleted file mode 100644
index be0472f398..0000000000
--- a/keyboards/evyd13/wasdat/wasdat.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_all( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
-    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, XXX, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_fullsize_iso( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26,      K59, K57, K56, K5C, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D,                          K39, K37, K36, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_tkl_ansi( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D, \
-    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
-) \
-{ \
-    { K00, XXX, K02, K03, XXX, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
-
-#define LAYOUT_tkl_iso( \
-    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
-    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
-    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26, \
-    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D, \
-    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
-    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
-) \
-{ \
-    { K00, XXX, K02, K03, K04, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
-    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
-    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
-    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
-    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
-}
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index ab15586484..3841f56cbd 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/info.json
@@ -30,455 +30,470 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_fullsize_iso"
+    },
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
 
-                {"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},
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
 
-                {"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},
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"\"", "x":11.75, "y":3.5},
-                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
 
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.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},
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"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},
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "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},
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
 
-                {"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},
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.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},
+                {"matrix": [7, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 6], "x": 20.5, "y": 1.5},
+                {"matrix": [5, 6], "x": 21.5, "y": 1.5},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
 
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 7], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 6], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"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},
+                {"matrix": [2, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [2, 7], "x": 19.5, "y": 3.5},
+                {"matrix": [2, 6], "x": 20.5, "y": 3.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5},
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
 
-                {"label":"0", "x":18.5, "y":5.5, "w":2},
-                {"label":".", "x":20.5, "y":5.5}
+                {"matrix": [1, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [1, 7], "x": 19.5, "y": 4.5},
+                {"matrix": [1, 6], "x": 20.5, "y": 4.5},
+                {"matrix": [1, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 6], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.5},
-                {"label":"1", "x":1, "y":1.5},
-                {"label":"2", "x":2, "y":1.5},
-                {"label":"3", "x":3, "y":1.5},
-                {"label":"4", "x":4, "y":1.5},
-                {"label":"5", "x":5, "y":1.5},
-                {"label":"6", "x":6, "y":1.5},
-                {"label":"7", "x":7, "y":1.5},
-                {"label":"8", "x":8, "y":1.5},
-                {"label":"9", "x":9, "y":1.5},
-                {"label":"0", "x":10, "y":1.5},
-                {"label":"_", "x":11, "y":1.5},
-                {"label":"+", "x":12, "y":1.5},
-                {"label":"Backspace", "x":13, "y":1.5, "w":2},
-                
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"Page Up", "x":17.25, "y":1.5},
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
 
-                {"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},
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
 
-                {"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},
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
 
-                {"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},
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [1, 11], "x": 13.5, "y": 2.5, "w": 1.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
+                {"matrix": [0, 5], "x": 0, "y": 0},
 
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [6, 4], "x": 2, "y": 0},
+                {"matrix": [6, 2], "x": 3, "y": 0},
+                {"matrix": [2, 2], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
 
-                {"label":"\u00ac", "x":0, "y":1.5},
-                {"label":"!", "x":1, "y":1.5},
-                {"label":"\"", "x":2, "y":1.5},
-                {"label":"\u00a3", "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},
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [0, 12], "x": 7.5, "y": 0},
+                {"matrix": [2, 15], "x": 8.5, "y": 0},
+                {"matrix": [6, 15], "x": 9.5, "y": 0},
 
-                {"label":"Insert", "x":15.25, "y":1.5},
-                {"label":"Home", "x":16.25, "y":1.5},
-                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"matrix": [6, 11], "x": 11, "y": 0},
+                {"matrix": [3, 11], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [5, 11], "x": 14, "y": 0},
 
-                {"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},
+                {"matrix": [3, 3], "x": 15.25, "y": 0},
+                {"matrix": [4, 3], "x": 16.25, "y": 0},
+                {"matrix": [4, 1], "x": 17.25, "y": 0},
 
-                {"label":"Delete", "x":15.25, "y":2.5},
-                {"label":"End", "x":16.25, "y":2.5},
-                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"matrix": [6, 5], "x": 0, "y": 1.5},
+                {"matrix": [3, 5], "x": 1, "y": 1.5},
+                {"matrix": [3, 4], "x": 2, "y": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1.5},
+                {"matrix": [3, 0], "x": 4, "y": 1.5},
+                {"matrix": [6, 0], "x": 5, "y": 1.5},
+                {"matrix": [6, 10], "x": 6, "y": 1.5},
+                {"matrix": [3, 10], "x": 7, "y": 1.5},
+                {"matrix": [3, 12], "x": 8, "y": 1.5},
+                {"matrix": [3, 15], "x": 9, "y": 1.5},
+                {"matrix": [3, 13], "x": 10, "y": 1.5},
+                {"matrix": [6, 13], "x": 11, "y": 1.5},
+                {"matrix": [6, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 11], "x": 13, "y": 1.5, "w": 2},
 
-                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.5},
-                {"label":"S", "x":2.75, "y":3.5},
-                {"label":"D", "x":3.75, "y":3.5},
-                {"label":"F", "x":4.75, "y":3.5},
-                {"label":"G", "x":5.75, "y":3.5},
-                {"label":"H", "x":6.75, "y":3.5},
-                {"label":"J", "x":7.75, "y":3.5},
-                {"label":"K", "x":8.75, "y":3.5},
-                {"label":"L", "x":9.75, "y":3.5},
-                {"label":":", "x":10.75, "y":3.5},
-                {"label":"@", "x":11.75, "y":3.5},
-                {"label":"~", "x":12.75, "y":3.5},
-                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"matrix": [6, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [6, 14], "x": 16.25, "y": 1.5},
+                {"matrix": [6, 6], "x": 17.25, "y": 1.5},
 
-                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.5},
-                {"label":"Z", "x":2.25, "y":4.5},
-                {"label":"X", "x":3.25, "y":4.5},
-                {"label":"C", "x":4.25, "y":4.5},
-                {"label":"V", "x":5.25, "y":4.5},
-                {"label":"B", "x":6.25, "y":4.5},
-                {"label":"N", "x":7.25, "y":4.5},
-                {"label":"M", "x":8.25, "y":4.5},
-                {"label":"<", "x":9.25, "y":4.5},
-                {"label":">", "x":10.25, "y":4.5},
-                {"label":"?", "x":11.25, "y":4.5},
-                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"matrix": [2, 5], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 5], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 0], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 12], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 13], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
 
-                {"label":"\u2191", "x":16.25, "y":4.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 6], "x": 17.25, "y": 2.5},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-                {"x":3.75, "y":5.5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.5, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"matrix": [2, 4], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [1, 5], "x": 1.75, "y": 3.5},
+                {"matrix": [1, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [1, 2], "x": 3.75, "y": 3.5},
+                {"matrix": [1, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 0], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 10], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 10], "x": 7.75, "y": 3.5},
+                {"matrix": [1, 12], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 15], "x": 9.75, "y": 3.5},
+                {"matrix": [1, 13], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 13], "x": 11.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 12.75, "y": 3.5},
+                {"matrix": [7, 11], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
 
-                {"label":"\u2190", "x":15.25, "y":5.5},
-                {"label":"\u2193", "x":16.25, "y":5.5},
-                {"label":"\u2192", "x":17.25, "y":5.5}
+                {"matrix": [2, 9], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 4], "x": 1.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 4], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.5},
+                {"matrix": [5, 10], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 10], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 12], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 15], "x": 10.25, "y": 4.5},
+                {"matrix": [5, 13], "x": 11.25, "y": 4.5},
+                {"matrix": [1, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
+
+                {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 8], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 3], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 3], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/evyd13/wasdat_code/wasdat_code.h b/keyboards/evyd13/wasdat_code/wasdat_code.h
deleted file mode 100644
index b586f4aade..0000000000
--- a/keyboards/evyd13/wasdat_code/wasdat_code.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
- 
-#define LAYOUT_all LAYOUT_fullsize_iso
-
-#define LAYOUT_fullsize_ansi( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36,      k48, k47, k46, k4e, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                          k28, k27, k26,      \
-    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
-) \
-{ \
-    { k00, XXX, k02, k03, XXX, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_fullsize_iso( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36,      k48, k47, k46, k4e, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                          k28, k27, k26,      \
-    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_tkl_ansi( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                     \
-    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
-) \
-{ \
-    { k00, XXX, k02, k03, XXX, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
-
-#define LAYOUT_tkl_iso( \
-    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
-    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
-    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36, \
-    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                     \
-    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
-    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
-) \
-{ \
-    { k00, XXX, k02, k03, k04, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
-    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
-    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
-    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
-    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
-    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
-}
diff --git a/keyboards/gh80_3000/gh80_3000.h b/keyboards/gh80_3000/gh80_3000.h
deleted file mode 100644
index 9c58d6fe58..0000000000
--- a/keyboards/gh80_3000/gh80_3000.h
+++ /dev/null
@@ -1,143 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// default keymap: all 117 keys with ANSI Enter
-#define LAYOUT( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,        k24, k25, k26,   k27, k28, k29, k2A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                         k87, k88, k89, k8A, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \
-    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \
-}
-
-// default ISO keymap: all 117 keys with ISO Enter
-#define LAYOUT_iso( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,        k04, k05, k06,   k07, k08, k09, k0A, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,             k24, k25, k26,   k27, k28, k29, k2A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                         k87, k88, k89, k8A, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79, k7A,             k96,        k97, k98, k99, k9A, \
-    kA0, kA1, kA2, kA3,      k84, k85, k86,           k64, k65, k94, k95,        kA4, kA5, kA6,   kA7, kA8, kA9, kAA \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
-    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kAA } \
-}
-
-// Standard ANSI Keyboard
-#define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \
-    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, XXX, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Standard ISO Keyboard
-#define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0, kA1, kA2,                k85,                k64, k65, k94, k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Winkeyless ANSI Keyboard
-#define LAYOUT_fullsize_ansi_wkl( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59, k5A,   k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69,      k6A,                    k87, k88, k89, \
-    k90,      k92, k93, k70, k71, k72, k73, k75, k76, k77, k78,      k79,        k96,        k97, k98, k99, kAA, \
-    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, XXX, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
-
-// Winkeyless ISO Keyboard
-#define LAYOUT_fullsize_iso_wkl( \
-    k00,      k01, k02, k03, k30, k31, k32, k33, k36, k37, k38, k39, k3A,   k04, k05, k06, \
-\
-    k10, k11, k12, k13, k40, k41, k42, k43, k44, k45, k46, k47, k48, k4A,   k14, k15, k16,   k17, k18, k19, k1A, \
-    k20, k21, k22, k23, k50, k51, k52, k53, k55, k56, k57, k58, k59,        k24, k25, k26,   k27, k28, k29, k8A, \
-    k80, k81, k82, k83, k60, k61, k62, k63, k66, k67, k68, k69, k5A, k6A,                    k87, k88, k89, \
-    k90, k91, k92, k93, k70, k71, k72, k73, k75, k76, k77, k78, k79,             k96,        k97, k98, k99, kAA, \
-    kA0,      kA2,                     k85,                k65,      k95,   kA4, kA5, kA6,   kA7,      kA9 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A }, \
-    { k50, k51, k52, k53, XXX, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, XXX, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79, XXX }, \
-    { k80, k81, k82, k83, XXX, k85, XXX, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, XXX, k95, k96, k97, k98, k99, XXX }, \
-    { kA0, XXX, kA2, XXX, kA4, kA5, kA6, kA7, XXX, kA9, kAA } \
-}
diff --git a/keyboards/gh80_3000/info.json b/keyboards/gh80_3000/info.json
index abc9c14051..4d4bca1661 100644
--- a/keyboards/gh80_3000/info.json
+++ b/keyboards/gh80_3000/info.json
@@ -18,27 +18,784 @@
     "community_layouts": ["fullsize_ansi", "fullsize_iso"],
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K007", "x":18.5, "y":0}, {"label":"K008", "x":19.5, "y":0}, {"label":"K009", "x":20.5, "y":0}, {"label":"K010", "x":21.5, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K409", "x":13, "y":1.5}, {"label":"K410", "x":14, "y":1.5}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K210", "x":21.5, "y":2.5}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K810", "x":21.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, {"label":"K710", "x":14, "y":4.5}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"K910", "x":21.5, "y":4.5}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA01", "x":1.5, "y":5.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"KA03", "x":4, "y":5.5}, {"label":"K804", "x":5, "y":5.5, "w":2}, {"label":"K805", "x":7, "y":5.5}, {"label":"K806", "x":8, "y":5.5, "w":2}, {"label":"K604", "x":10, "y":5.5}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K904", "x":12.5, "y":5.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5}, {"label":"KA08", "x":19.5, "y":5.5}, {"label":"KA09", "x":20.5, "y":5.5}, {"label":"KA10", "x":21.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 0},
+                {"matrix": [0, 8], "x": 19.5, "y": 0},
+                {"matrix": [0, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 9], "x": 13, "y": 1.5},
+                {"matrix": [4, 10], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 21.5, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [7, 10], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5},
+                {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2},
+                {"matrix": [8, 5], "x": 7, "y": 5.5},
+                {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2},
+                {"matrix": [6, 4], "x": 10, "y": 5.5},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5},
+                {"matrix": [10, 8], "x": 19.5, "y": 5.5},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_iso": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K007", "x":18.5, "y":0}, {"label":"K008", "x":19.5, "y":0}, {"label":"K009", "x":20.5, "y":0}, {"label":"K010", "x":21.5, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K409", "x":13, "y":1.5}, {"label":"K410", "x":14, "y":1.5}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K210", "x":21.5, "y":2.5}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K810", "x":21.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, {"label":"K710", "x":14, "y":4.5}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"K910", "x":21.5, "y":4.5}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA01", "x":1.5, "y":5.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"KA03", "x":4, "y":5.5}, {"label":"K804", "x":5, "y":5.5, "w":2}, {"label":"K805", "x":7, "y":5.5}, {"label":"K806", "x":8, "y":5.5, "w":2}, {"label":"K604", "x":10, "y":5.5}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K904", "x":12.5, "y":5.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5}, {"label":"KA08", "x":19.5, "y":5.5}, {"label":"KA09", "x":20.5, "y":5.5}, {"label":"KA10", "x":21.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 18.5, "y": 0},
+                {"matrix": [0, 8], "x": 19.5, "y": 0},
+                {"matrix": [0, 9], "x": 20.5, "y": 0},
+                {"matrix": [0, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 9], "x": 13, "y": 1.5},
+                {"matrix": [4, 10], "x": 14, "y": 1.5},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 21.5, "y": 2.5},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75},
+                {"matrix": [7, 10], "x": 14, "y": 4.5},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.5},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 3], "x": 4, "y": 5.5},
+                {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2},
+                {"matrix": [8, 5], "x": 7, "y": 5.5},
+                {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2},
+                {"matrix": [6, 4], "x": 10, "y": 5.5},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5},
+                {"matrix": [10, 8], "x": 19.5, "y": 5.5},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_fullsize_ansi": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":2.25}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.25}, {"label":"KA01", "x":1.25, "y":5.5, "w":1.25}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.25}, {"label":"K805", "x":3.75, "y":5.5, "w":6.25}, {"label":"K604", "x":10, "y":5.5, "w":1.25}, {"label":"K605", "x":11.25, "y":5.5, "w":1.25}, {"label":"K904", "x":12.5, "y":5.5, "w":1.25}, {"label":"K905", "x":13.75, "y":5.5, "w":1.25}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_fullsize_iso": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.25}, {"label":"KA01", "x":1.25, "y":5.5, "w":1.25}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.25}, {"label":"K805", "x":3.75, "y":5.5, "w":6.25}, {"label":"K604", "x":10, "y":5.5, "w":1.25}, {"label":"K605", "x":11.25, "y":5.5, "w":1.25}, {"label":"K904", "x":12.5, "y":5.5, "w":1.25}, {"label":"K905", "x":13.75, "y":5.5, "w":1.25}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [8, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [6, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_fullsize_ansi_wkl": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":2.25}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"K805", "x":4, "y":5.5, "w":7}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
-        },
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
+        },
         "LAYOUT_fullsize_iso_wkl": {
-            "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":2, "y":0}, {"label":"K002", "x":3, "y":0}, {"label":"K003", "x":4, "y":0}, {"label":"K300", "x":5, "y":0}, {"label":"K301", "x":6.5, "y":0}, {"label":"K302", "x":7.5, "y":0}, {"label":"K303", "x":8.5, "y":0}, {"label":"K306", "x":9.5, "y":0}, {"label":"K307", "x":11, "y":0}, {"label":"K308", "x":12, "y":0}, {"label":"K309", "x":13, "y":0}, {"label":"K310", "x":14, "y":0}, {"label":"K004", "x":15.25, "y":0}, {"label":"K005", "x":16.25, "y":0}, {"label":"K006", "x":17.25, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2, "y":1.5}, {"label":"K103", "x":3, "y":1.5}, {"label":"K400", "x":4, "y":1.5}, {"label":"K401", "x":5, "y":1.5}, {"label":"K402", "x":6, "y":1.5}, {"label":"K403", "x":7, "y":1.5}, {"label":"K404", "x":8, "y":1.5}, {"label":"K405", "x":9, "y":1.5}, {"label":"K406", "x":10, "y":1.5}, {"label":"K407", "x":11, "y":1.5}, {"label":"K408", "x":12, "y":1.5}, {"label":"K410", "x":13, "y":1.5, "w":2}, {"label":"K104", "x":15.25, "y":1.5}, {"label":"K105", "x":16.25, "y":1.5}, {"label":"K106", "x":17.25, "y":1.5}, {"label":"K107", "x":18.5, "y":1.5}, {"label":"K108", "x":19.5, "y":1.5}, {"label":"K109", "x":20.5, "y":1.5}, {"label":"K110", "x":21.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5, "w":1.5}, {"label":"K201", "x":1.5, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5}, {"label":"K203", "x":3.5, "y":2.5}, {"label":"K500", "x":4.5, "y":2.5}, {"label":"K501", "x":5.5, "y":2.5}, {"label":"K502", "x":6.5, "y":2.5}, {"label":"K503", "x":7.5, "y":2.5}, {"label":"K505", "x":8.5, "y":2.5}, {"label":"K506", "x":9.5, "y":2.5}, {"label":"K507", "x":10.5, "y":2.5}, {"label":"K508", "x":11.5, "y":2.5}, {"label":"K509", "x":12.5, "y":2.5}, {"label":"K204", "x":15.25, "y":2.5}, {"label":"K205", "x":16.25, "y":2.5}, {"label":"K206", "x":17.25, "y":2.5}, {"label":"K207", "x":18.5, "y":2.5}, {"label":"K208", "x":19.5, "y":2.5}, {"label":"K209", "x":20.5, "y":2.5}, {"label":"K810", "x":21.5, "y":2.5, "h":2}, {"label":"K800", "x":0, "y":3.5, "w":1.75}, {"label":"K801", "x":1.75, "y":3.5}, {"label":"K802", "x":2.75, "y":3.5}, {"label":"K803", "x":3.75, "y":3.5}, {"label":"K600", "x":4.75, "y":3.5}, {"label":"K601", "x":5.75, "y":3.5}, {"label":"K602", "x":6.75, "y":3.5}, {"label":"K603", "x":7.75, "y":3.5}, {"label":"K606", "x":8.75, "y":3.5}, {"label":"K607", "x":9.75, "y":3.5}, {"label":"K608", "x":10.75, "y":3.5}, {"label":"K609", "x":11.75, "y":3.5}, {"label":"K510", "x":12.75, "y":3.5}, {"label":"K610", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"K807", "x":18.5, "y":3.5}, {"label":"K808", "x":19.5, "y":3.5}, {"label":"K809", "x":20.5, "y":3.5}, {"label":"K900", "x":0, "y":4.5, "w":1.25}, {"label":"K901", "x":1.25, "y":4.5}, {"label":"K902", "x":2.25, "y":4.5}, {"label":"K903", "x":3.25, "y":4.5}, {"label":"K700", "x":4.25, "y":4.5}, {"label":"K701", "x":5.25, "y":4.5}, {"label":"K702", "x":6.25, "y":4.5}, {"label":"K703", "x":7.25, "y":4.5}, {"label":"K705", "x":8.25, "y":4.5}, {"label":"K706", "x":9.25, "y":4.5}, {"label":"K707", "x":10.25, "y":4.5}, {"label":"K708", "x":11.25, "y":4.5}, {"label":"K709", "x":12.25, "y":4.5, "w":2.75}, {"label":"K906", "x":16.25, "y":4.5}, {"label":"K907", "x":18.5, "y":4.5}, {"label":"K908", "x":19.5, "y":4.5}, {"label":"K909", "x":20.5, "y":4.5}, {"label":"KA10", "x":21.5, "y":4.5, "h":2}, {"label":"KA00", "x":0, "y":5.5, "w":1.5}, {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, {"label":"K805", "x":4, "y":5.5, "w":7}, {"label":"K605", "x":11, "y":5.5, "w":1.5}, {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, {"label":"KA04", "x":15.25, "y":5.5}, {"label":"KA05", "x":16.25, "y":5.5}, {"label":"KA06", "x":17.25, "y":5.5}, {"label":"KA07", "x":18.5, "y":5.5, "w":2}, {"label":"KA09", "x":20.5, "y":5.5}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [3, 0], "x": 5, "y": 0},
+
+                {"matrix": [3, 1], "x": 6.5, "y": 0},
+                {"matrix": [3, 2], "x": 7.5, "y": 0},
+                {"matrix": [3, 3], "x": 8.5, "y": 0},
+                {"matrix": [3, 6], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 8], "x": 12, "y": 0},
+                {"matrix": [3, 9], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 0},
+                {"matrix": [0, 5], "x": 16.25, "y": 0},
+                {"matrix": [0, 6], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [4, 0], "x": 4, "y": 1.5},
+                {"matrix": [4, 1], "x": 5, "y": 1.5},
+                {"matrix": [4, 2], "x": 6, "y": 1.5},
+                {"matrix": [4, 3], "x": 7, "y": 1.5},
+                {"matrix": [4, 4], "x": 8, "y": 1.5},
+                {"matrix": [4, 5], "x": 9, "y": 1.5},
+                {"matrix": [4, 6], "x": 10, "y": 1.5},
+                {"matrix": [4, 7], "x": 11, "y": 1.5},
+                {"matrix": [4, 8], "x": 12, "y": 1.5},
+                {"matrix": [4, 10], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 6], "x": 17.25, "y": 1.5},
+
+                {"matrix": [1, 7], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 8], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 9], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 10], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 2.5},
+                {"matrix": [5, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 2.5},
+
+                {"matrix": [2, 4], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 6], "x": 17.25, "y": 2.5},
+
+                {"matrix": [2, 7], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 20.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [8, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [8, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [8, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [6, 0], "x": 4.75, "y": 3.5},
+                {"matrix": [6, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [6, 8], "x": 10.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 10], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 3.5},
+                {"matrix": [8, 8], "x": 19.5, "y": 3.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 3.5},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [9, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [9, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 7.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 8.25, "y": 4.5},
+                {"matrix": [7, 6], "x": 9.25, "y": 4.5},
+                {"matrix": [7, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 8], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 6], "x": 16.25, "y": 4.5},
+
+                {"matrix": [9, 7], "x": 18.5, "y": 4.5},
+                {"matrix": [9, 8], "x": 19.5, "y": 4.5},
+                {"matrix": [9, 9], "x": 20.5, "y": 4.5},
+                {"matrix": [10, 10], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 4], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 6], "x": 17.25, "y": 5.5},
+
+                {"matrix": [10, 7], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [10, 9], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json
index f29633d429..a4d0b11b58 100644
--- a/keyboards/handwired/boss566y/redragon_vara/info.json
+++ b/keyboards/handwired/boss566y/redragon_vara/info.json
@@ -19,110 +19,128 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"K00 (B0,D1)", "x":0, "y":0},
-                {"label":"K02 (B0,D3)", "x":2, "y":0},
-                {"label":"K03 (B0,C6)", "x":3, "y":0},
-                {"label":"K04 (B0,D5)", "x":4, "y":0},
-                {"label":"K05 (B0,C7)", "x":5, "y":0},
-                {"label":"K07 (B0,D7)", "x":6.5, "y":0},
-                {"label":"K08 (B0,B4)", "x":7.5, "y":0},
-                {"label":"K09 (B0,B5)", "x":8.5, "y":0},
-                {"label":"K0A (B0,B6)", "x":9.5, "y":0},
-                {"label":"K6A (F0,B6)", "x":11, "y":0},
-                {"label":"K69 (F0,B5)", "x":12, "y":0},
-                {"label":"K68 (F0,B4)", "x":13, "y":0},
-                {"label":"K67 (F0,D7)", "x":14, "y":0},
-                {"label":"K66 (F0,D4)", "x":15.25, "y":0},
-                {"label":"K65 (F0,C7)", "x":16.25, "y":0},
-                {"label":"K64 (F0,D5)", "x":17.25, "y":0},
-                {"label":"K10 (B1,D1)", "x":0, "y":1.5},
-                {"label":"K11 (B1,D2)", "x":1, "y":1.5},
-                {"label":"K12 (B1,D3)", "x":2, "y":1.5},
-                {"label":"K13 (B1,C6)", "x":3, "y":1.5},
-                {"label":"K14 (B1,D5)", "x":4, "y":1.5},
-                {"label":"K15 (B1,C7)", "x":5, "y":1.5},
-                {"label":"K16 (B1,D4)", "x":6, "y":1.5},
-                {"label":"K17 (B1,D7)", "x":7, "y":1.5},
-                {"label":"K18 (B1,B4)", "x":8, "y":1.5},
-                {"label":"K19 (B1,B5)", "x":9, "y":1.5},
-                {"label":"K1A (B1,B6)", "x":10, "y":1.5},
-                {"label":"K7A (F1,B6)", "x":11, "y":1.5},
-                {"label":"K79 (F1,B5)", "x":12, "y":1.5},
-                {"label":"K78 (F1,B4)", "x":13, "y":1.5, "w":2},
-                {"label":"K76 (F1,D4)", "x":15.25, "y":1.5},
-                {"label":"K75 (F1,C7)", "x":16.25, "y":1.5},
-                {"label":"K74 (F1,D5)", "x":17.25, "y":1.5},
-                {"label":"K73 (F1,C6)", "x":18.5, "y":1.5},
-                {"label":"K72 (F1,D3)", "x":19.5, "y":1.5},
-                {"label":"K71 (F1,D2)", "x":20.5, "y":1.5},
-                {"label":"K70 (F1,D1)", "x":21.5, "y":1.5},
-                {"label":"K20 (B2,D1)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B2,D2)", "x":1.5, "y":2.5},
-                {"label":"K22 (B2,D3)", "x":2.5, "y":2.5},
-                {"label":"K23 (B2,C6)", "x":3.5, "y":2.5},
-                {"label":"K24 (B2,D5)", "x":4.5, "y":2.5},
-                {"label":"K25 (B2,C7)", "x":5.5, "y":2.5},
-                {"label":"K26 (B2,D4)", "x":6.5, "y":2.5},
-                {"label":"K27 (B2,D7)", "x":7.5, "y":2.5},
-                {"label":"K28 (B2,B4)", "x":8.5, "y":2.5},
-                {"label":"K29 (B2,B5)", "x":9.5, "y":2.5},
-                {"label":"K2A (B2,B6)", "x":10.5, "y":2.5},
-                {"label":"K8A (F4,B6)", "x":11.5, "y":2.5},
-                {"label":"K89 (F4,B5)", "x":12.5, "y":2.5},
-                {"label":"K87 (F4,D7)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K86 (F4,D4)", "x":15.25, "y":2.5},
-                {"label":"K85 (F4,C7)", "x":16.25, "y":2.5},
-                {"label":"K84 (F4,D5)", "x":17.25, "y":2.5},
-                {"label":"K83 (F4,C6)", "x":18.5, "y":2.5},
-                {"label":"K82 (F4,D3)", "x":19.5, "y":2.5},
-                {"label":"K81 (F4,D2)", "x":20.5, "y":2.5},
-                {"label":"K90 (F5,D1)", "x":21.5, "y":2.5, "h":2},
-                {"label":"K30 (B3,D1)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B3,D2)", "x":1.75, "y":3.5},
-                {"label":"K32 (B3,D3)", "x":2.75, "y":3.5},
-                {"label":"K33 (B3,C6)", "x":3.75, "y":3.5},
-                {"label":"K34 (B3,D5)", "x":4.75, "y":3.5},
-                {"label":"K35 (B3,C7)", "x":5.75, "y":3.5},
-                {"label":"K36 (B3,D4)", "x":6.75, "y":3.5},
-                {"label":"K37 (B3,D7)", "x":7.75, "y":3.5},
-                {"label":"K38 (B3,B4)", "x":8.75, "y":3.5},
-                {"label":"K39 (B3,B5)", "x":9.75, "y":3.5},
-                {"label":"K3A (B3,B6)", "x":10.75, "y":3.5},
-                {"label":"K9A (F5,B6)", "x":11.75, "y":3.5},
-                {"label":"K98 (F5,B4)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K93 (F5,C6)", "x":18.5, "y":3.5},
-                {"label":"K92 (F5,D3)", "x":19.5, "y":3.5},
-                {"label":"K91 (F5,D2)", "x":20.5, "y":3.5},
-                {"label":"K40 (B7,D1)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (B7,D3)", "x":2.25, "y":4.5},
-                {"label":"K43 (B7,C6)", "x":3.25, "y":4.5},
-                {"label":"K44 (B7,D5)", "x":4.25, "y":4.5},
-                {"label":"K45 (B7,C7)", "x":5.25, "y":4.5},
-                {"label":"K46 (B7,D4)", "x":6.25, "y":4.5},
-                {"label":"K47 (B7,D7)", "x":7.25, "y":4.5},
-                {"label":"K48 (B7,B4)", "x":8.25, "y":4.5},
-                {"label":"K49 (B7,B5)", "x":9.25, "y":4.5},
-                {"label":"K4A (B7,B6)", "x":10.25, "y":4.5},
-                {"label":"KAA (F6,B6)", "x":11.25, "y":4.5},
-                {"label":"KA8 (F6,B4)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"KA5 (F6,C7)", "x":16.25, "y":4.5},
-                {"label":"KA3 (F6,C6)", "x":18.5, "y":4.5},
-                {"label":"KA2 (F6,D3)", "x":19.5, "y":4.5},
-                {"label":"KA1 (F6,D2)", "x":20.5, "y":4.5},
-                {"label":"KB0 (F7,D1)", "x":21.5, "y":4.5, "h":2},
-                {"label":"K50 (D0,D1)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (D0,D2)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K53 (D0,C6)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (D0,D4)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K5A (D0,B6)", "x":10, "y":5.5, "w":1.25},
-                {"label":"KBA (F7,B6)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"KB9 (F7,B5)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"KB7 (F7,D7)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"KB6 (F7,D4)", "x":15.25, "y":5.5},
-                {"label":"KB5 (F7,C7)", "x":16.25, "y":5.5},
-                {"label":"KB4 (F7,D5)", "x":17.25, "y":5.5},
-                {"label":"KB3 (F7,C6)", "x":18.5, "y":5.5, "w":2},
-                {"label":"KB1 (F7,D2)", "x":20.5, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [6, 10], "x": 11, "y": 0},
+                {"matrix": [6, 9], "x": 12, "y": 0},
+                {"matrix": [6, 8], "x": 13, "y": 0},
+                {"matrix": [6, 7], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 5], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [7, 10], "x": 11, "y": 1.5},
+                {"matrix": [7, 9], "x": 12, "y": 1.5},
+                {"matrix": [7, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 5], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 4], "x": 17.25, "y": 1.5},
+
+                {"matrix": [7, 3], "x": 18.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 19.5, "y": 1.5},
+                {"matrix": [7, 1], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 0], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 10], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 9], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 4], "x": 17.25, "y": 2.5},
+
+                {"matrix": [8, 3], "x": 18.5, "y": 2.5},
+                {"matrix": [8, 2], "x": 19.5, "y": 2.5},
+                {"matrix": [8, 1], "x": 20.5, "y": 2.5},
+                {"matrix": [9, 0], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [9, 3], "x": 18.5, "y": 3.5},
+                {"matrix": [9, 2], "x": 19.5, "y": 3.5},
+                {"matrix": [9, 1], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [10, 5], "x": 16.25, "y": 4.5},
+
+                {"matrix": [10, 3], "x": 18.5, "y": 4.5},
+                {"matrix": [10, 2], "x": 19.5, "y": 4.5},
+                {"matrix": [10, 1], "x": 20.5, "y": 4.5},
+                {"matrix": [11, 0], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 9], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [11, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [11, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [11, 5], "x": 16.25, "y": 5.5},
+                {"matrix": [11, 4], "x": 17.25, "y": 5.5},
+
+                {"matrix": [11, 3], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [11, 1], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
deleted file mode 100644
index 3809fa8ce4..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 boss566y
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_fullsize_ansi( \
-    K00,      K02, K03, K04, K05,   K07, K08, K09, K0A,    K6A, K69, K68, K67,  K66, K65, K64,                      \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K7A, K79, K78,       K76, K75, K74,  K73, K72, K71, K70, \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K8A, K89, K87,     K86, K85, K84,  K83, K82, K81, K90, \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K9A, K98,                         K93, K92, K91,      \
-    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, KAA, KA8,                KA5,       KA3, KA2, KA1, KB0, \
-    K50,  K51,  K53,              K56,                K5A,  KBA,  KB9,  KB7,    KB6, KB5, KB4,  KB3,      KB1       \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K07,   K08,   K09,   K0A   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A   }, \
-    { K50,   K51,   KC_NO, K53,   KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A   }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO, K64,   K65,   K66,   K67,   K68,   K69,   K6A   }, \
-    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, K78,   K79,   K7A   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   KC_NO, K89,   K8A   }, \
-    { K90,   K91,   K92,   K93,   KC_NO, KC_NO, KC_NO, KC_NO, K98,   KC_NO, K9A   }, \
-    { KC_NO, KA1,   KA2,   KA3,   KC_NO, KA5,   KC_NO, KC_NO, KA8,   KC_NO, KAA   }, \
-    { KB0,   KB1,   KC_NO, KB3,   KB4,   KB5,   KB6,   KB7,   KC_NO, KB9,   KBA   }, \
-}
diff --git a/keyboards/handwired/hnah108/hnah108.c b/keyboards/handwired/hnah108/hnah108.c
index 20cbe941fd..fde7b16564 100644
--- a/keyboards/handwired/hnah108/hnah108.c
+++ b/keyboards/handwired/hnah108/hnah108.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hnah108.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/handwired/hnah108/hnah108.h b/keyboards/handwired/hnah108/hnah108.h
deleted file mode 100644
index a11f9fc6d5..0000000000
--- a/keyboards/handwired/hnah108/hnah108.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2019 HnahKB
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,        k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                    k96, k97, k88, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
-    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \
-}
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json
index e18dc6c09d..6fdf6a699a 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/info.json
@@ -28,341 +28,398 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 13.75, "y": 3.25, "w": 1.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 6], "x": 18.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 19.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 1.25},
-                {"x": 1.25, "y": 4.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [8, 4], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 6], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 7], "x": 18.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 3.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6.5, "y": 0},
-                {"x": 7.5, "y": 0},
-                {"x": 8.5, "y": 0},
-                {"x": 9.5, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15.25, "y": 0},
-                {"x": 16.25, "y": 0},
-                {"x": 17.25, "y": 0},
-                {"x": 18.5, "y": 0},
-                {"x": 19.5, "y": 0},
-                {"x": 20.5, "y": 0},
-                {"x": 21.5, "y": 0},
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-                {"x": 4, "y": 1.25},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.25},
-                {"x": 7, "y": 1.25},
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.25},
-                {"x": 10, "y": 1.25},
-                {"x": 11, "y": 1.25},
-                {"x": 12, "y": 1.25},
-                {"x": 13, "y": 1.25, "w": 2},
-                {"x": 15.25, "y": 1.25},
-                {"x": 16.25, "y": 1.25},
-                {"x": 17.25, "y": 1.25},
-                {"x": 18.5, "y": 1.25},
-                {"x": 19.5, "y": 1.25},
-                {"x": 20.5, "y": 1.25},
-                {"x": 21.5, "y": 1.25},
-                {"x": 0, "y": 2.25, "w": 1.5},
-                {"x": 1.5, "y": 2.25},
-                {"x": 2.5, "y": 2.25},
-                {"x": 3.5, "y": 2.25},
-                {"x": 4.5, "y": 2.25},
-                {"x": 5.5, "y": 2.25},
-                {"x": 6.5, "y": 2.25},
-                {"x": 7.5, "y": 2.25},
-                {"x": 8.5, "y": 2.25},
-                {"x": 9.5, "y": 2.25},
-                {"x": 10.5, "y": 2.25},
-                {"x": 11.5, "y": 2.25},
-                {"x": 12.5, "y": 2.25},
-                {"x": 13.5, "y": 2.25, "w": 1.5},
-                {"x": 15.25, "y": 2.25},
-                {"x": 16.25, "y": 2.25},
-                {"x": 17.25, "y": 2.25},
-                {"x": 18.5, "y": 2.25},
-                {"x": 19.5, "y": 2.25},
-                {"x": 20.5, "y": 2.25},
-                {"x": 21.5, "y": 2.25, "h": 2},
-                {"x": 0, "y": 3.25, "w": 1.75},
-                {"x": 1.75, "y": 3.25},
-                {"x": 2.75, "y": 3.25},
-                {"x": 3.75, "y": 3.25},
-                {"x": 4.75, "y": 3.25},
-                {"x": 5.75, "y": 3.25},
-                {"x": 6.75, "y": 3.25},
-                {"x": 7.75, "y": 3.25},
-                {"x": 8.75, "y": 3.25},
-                {"x": 9.75, "y": 3.25},
-                {"x": 10.75, "y": 3.25},
-                {"x": 11.75, "y": 3.25},
-                {"x": 12.75, "y": 3.25, "w": 2.25},
-                {"x": 18.5, "y": 3.25},
-                {"x": 19.5, "y": 3.25},
-                {"x": 20.5, "y": 3.25},
-                {"x": 0, "y": 4.25, "w": 2.25},
-                {"x": 2.25, "y": 4.25},
-                {"x": 3.25, "y": 4.25},
-                {"x": 4.25, "y": 4.25},
-                {"x": 5.25, "y": 4.25},
-                {"x": 6.25, "y": 4.25},
-                {"x": 7.25, "y": 4.25},
-                {"x": 8.25, "y": 4.25},
-                {"x": 9.25, "y": 4.25},
-                {"x": 10.25, "y": 4.25},
-                {"x": 11.25, "y": 4.25},
-                {"x": 12.25, "y": 4.25, "w": 2.75},
-                {"x": 16.25, "y": 4.25},
-                {"x": 18.5, "y": 4.25},
-                {"x": 19.5, "y": 4.25},
-                {"x": 20.5, "y": 4.25},
-                {"x": 21.5, "y": 4.25, "h": 2},
-                {"x": 0, "y": 5.25, "w": 1.25},
-                {"x": 1.25, "y": 5.25, "w": 1.25},
-                {"x": 2.5, "y": 5.25, "w": 1.25},
-                {"x": 3.75, "y": 5.25, "w": 6.25},
-                {"x": 10, "y": 5.25, "w": 1.25},
-                {"x": 11.25, "y": 5.25, "w": 1.25},
-                {"x": 12.5, "y": 5.25, "w": 1.25},
-                {"x": 13.75, "y": 5.25, "w": 1.25},
-                {"x": 15.25, "y": 5.25},
-                {"x": 16.25, "y": 5.25},
-                {"x": 17.25, "y": 5.25},
-                {"x": 18.5, "y": 5.25, "w": 2},
-                {"x": 20.5, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [6, 0], "x": 13, "y": 0},
+                {"matrix": [6, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 2], "x": 15.25, "y": 0},
+                {"matrix": [6, 3], "x": 16.25, "y": 0},
+                {"matrix": [6, 4], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 5], "x": 18.5, "y": 0},
+                {"matrix": [6, 6], "x": 19.5, "y": 0},
+                {"matrix": [6, 7], "x": 20.5, "y": 0},
+                {"matrix": [6, 8], "x": 21.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [7, 0], "x": 11, "y": 1.25},
+                {"matrix": [7, 1], "x": 12, "y": 1.25},
+                {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [7, 3], "x": 15.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 17.25, "y": 1.25},
+
+                {"matrix": [7, 6], "x": 18.5, "y": 1.25},
+                {"matrix": [7, 7], "x": 19.5, "y": 1.25},
+                {"matrix": [7, 8], "x": 20.5, "y": 1.25},
+                {"matrix": [6, 9], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 11.5, "y": 2.25},
+                {"matrix": [8, 1], "x": 12.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [8, 3], "x": 15.25, "y": 2.25},
+                {"matrix": [8, 4], "x": 16.25, "y": 2.25},
+                {"matrix": [8, 5], "x": 17.25, "y": 2.25},
+
+                {"matrix": [8, 6], "x": 18.5, "y": 2.25},
+                {"matrix": [8, 7], "x": 19.5, "y": 2.25},
+                {"matrix": [7, 9], "x": 20.5, "y": 2.25},
+                {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+                {"matrix": [9, 4], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [9, 6], "x": 18.5, "y": 3.25},
+                {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+                {"matrix": [8, 8], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 0], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [9, 5], "x": 16.25, "y": 4.25},
+
+                {"matrix": [9, 8], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.25},
+
+                {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [8, 10], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json
index f22616b338..ac892719ad 100644
--- a/keyboards/handwired/oem_ansi_fullsize/info.json
+++ b/keyboards/handwired/oem_ansi_fullsize/info.json
@@ -19,115 +19,128 @@
     "layouts": {
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"matrix": [0, 0], "label": "ESC", "x":0, "y":0},
-                {"matrix": [0, 2], "label": "F1", "x":2, "y":0},
-                {"matrix": [0, 3], "label": "F2", "x":3, "y":0},
-                {"matrix": [0, 4], "label": "F3", "x":4, "y":0},
-                {"matrix": [0, 5], "label": "F4", "x":5, "y":0},
-                {"matrix": [0, 7], "label": "F5", "x":6.5, "y":0},
-                {"matrix": [0, 8], "label": "F6", "x":7.5, "y":0},
-                {"matrix": [0, 9], "label": "F7", "x":8.5, "y":0},
-                {"matrix": [0, 10], "label": "F8", "x":9.5, "y":0},
-                {"matrix": [0, 11], "label": "F9", "x":11, "y":0},
-                {"matrix": [0, 12], "label": "F10", "x":12, "y":0},
-                {"matrix": [0, 13], "label": "F11", "x":13, "y":0},
-                {"matrix": [0, 14], "label": "F12", "x":14, "y":0},
-                {"matrix": [0, 15], "label": "PSCR", "x":15.25, "y":0},
-                {"matrix": [0, 16], "label": "SLCK", "x":16.25, "y":0},
-                {"matrix": [0, 17], "label": "PAUS", "x":17.25, "y":0},
-                
-                {"matrix": [1, 0], "label": "GRV", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label": "1", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label": "2", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label": "3", "x":3, "y":1.25},
-                {"matrix": [1, 4], "label": "4", "x":4, "y":1.25},
-                {"matrix": [1, 5], "label": "5", "x":5, "y":1.25},
-                {"matrix": [1, 6], "label": "6", "x":6, "y":1.25},
-                {"matrix": [1, 7], "label": "7", "x":7, "y":1.25},
-                {"matrix": [1, 8], "label": "8", "x":8, "y":1.25},
-                {"matrix": [1, 9], "label": "9", "x":9, "y":1.25},
-                {"matrix": [1, 10], "label": "0", "x":10, "y":1.25},
-                {"matrix": [1, 11], "label": "MINS", "x":11, "y":1.25},
-                {"matrix": [1, 12], "label": "EQL", "x":12, "y":1.25},
-                {"matrix": [1, 14], "label": "BSPC", "x":13, "y":1.25, "w":2},
-                {"matrix": [1, 15], "label": "INS", "x":15.25, "y":1.25},
-                {"matrix": [1, 16], "label": "HOME", "x":16.25, "y":1.25},
-                {"matrix": [1, 17], "label": "PGUP", "x":17.25, "y":1.25},
-                {"matrix": [1, 18], "label": "NLCK", "x":18.5, "y":1.25},
-                {"matrix": [1, 19], "label": "PSLS", "x":19.5, "y":1.25},
-                {"matrix": [1, 20], "label": "PAST", "x":20.5, "y":1.25},
-                {"matrix": [1, 21], "label": "PMNS", "x":21.5, "y":1.25},
-                
-                {"matrix": [2, 0], "label": "TAB", "x":0, "y":2.25, "w":1.5},
-                {"matrix": [2, 2], "label": "Q", "x":1.5, "y":2.25},
-                {"matrix": [2, 3], "label": "W", "x":2.5, "y":2.25},
-                {"matrix": [2, 4], "label": "E", "x":3.5, "y":2.25},
-                {"matrix": [2, 5], "label": "R", "x":4.5, "y":2.25},
-                {"matrix": [2, 6], "label": "T", "x":5.5, "y":2.25},
-                {"matrix": [2, 7], "label": "Y", "x":6.5, "y":2.25},
-                {"matrix": [2, 8], "label": "U", "x":7.5, "y":2.25},
-                {"matrix": [2, 9], "label": "I", "x":8.5, "y":2.25},
-                {"matrix": [2, 10], "label": "O", "x":9.5, "y":2.25},
-                {"matrix": [2, 11], "label": "P", "x":10.5, "y":2.25},
-                {"matrix": [2, 12], "label": "LBRC", "x":11.5, "y":2.25},
-                {"matrix": [2, 13], "label": "RBRC", "x":12.5, "y":2.25},
-                {"matrix": [2, 14], "label": "BSLS", "x":13.5, "y":2.25, "w":1.5},
-                {"matrix": [2, 15], "label": "DEL", "x":15.25, "y":2.25},
-                {"matrix": [2, 16], "label": "END", "x":16.25, "y":2.25},
-                {"matrix": [2, 17], "label": "PGDN", "x":17.25, "y":2.25},
-                {"matrix": [2, 18], "label": "P7", "x":18.5, "y":2.25},
-                {"matrix": [2, 19], "label": "P8", "x":19.5, "y":2.25},
-                {"matrix": [2, 20], "label": "P9", "x":20.5, "y":2.25},
-                {"matrix": [2, 21], "label": "PPLS", "x":21.5, "y":2.25, "h": 2},
-                
-                {"matrix": [3, 0], "label": "CAPS", "x":0, "y":3.25, "w":1.75},
-                {"matrix": [3, 2], "label": "A", "x":1.75, "y":3.25},
-                {"matrix": [3, 3], "label": "S", "x":2.75, "y":3.25},
-                {"matrix": [3, 4], "label": "D", "x":3.75, "y":3.25},
-                {"matrix": [3, 5], "label": "F", "x":4.75, "y":3.25},
-                {"matrix": [3, 6], "label": "G", "x":5.75, "y":3.25},
-                {"matrix": [3, 7], "label": "H", "x":6.75, "y":3.25},
-                {"matrix": [3, 8], "label": "J", "x":7.75, "y":3.25},
-                {"matrix": [3, 9], "label": "K", "x":8.75, "y":3.25},
-                {"matrix": [3, 10], "label": "L", "x":9.75, "y":3.25},
-                {"matrix": [3, 11], "label": "SCLN", "x":10.75, "y":3.25},
-                {"matrix": [3, 12], "label": "QUOT", "x":11.75, "y":3.25},
-                {"matrix": [3, 13], "label": "ENT", "x":12.75, "y":3.25, "w":2.25},
-                {"matrix": [3, 18], "label": "P4", "x":18.5, "y":3.25},
-                {"matrix": [3, 19], "label": "P5", "x":19.5, "y":3.25},
-                {"matrix": [3, 20], "label": "P6", "x":20.5, "y":3.25},
-                
-                {"matrix": [4, 1], "label": "LSFT", "x":0, "y":4.25, "w":2.25},
-                {"matrix": [4, 2], "label": "Z", "x":2.25, "y":4.25},
-                {"matrix": [4, 3], "label": "X", "x":3.25, "y":4.25},
-                {"matrix": [4, 4], "label": "C", "x":4.25, "y":4.25},
-                {"matrix": [4, 5], "label": "V", "x":5.25, "y":4.25},
-                {"matrix": [4, 6], "label": "B", "x":6.25, "y":4.25},
-                {"matrix": [4, 7], "label": "N", "x":7.25, "y":4.25},
-                {"matrix": [4, 8], "label": "M", "x":8.25, "y":4.25},
-                {"matrix": [4, 9], "label": "COMM", "x":9.25, "y":4.25},
-                {"matrix": [4, 10], "label": "DOT", "x":10.25, "y":4.25},
-                {"matrix": [4, 11], "label": "SLSH", "x":11.25, "y":4.25},
-                {"matrix": [4, 13], "label": "RSFT", "x":12.25, "y":4.25, "w":2.75},
-                {"matrix": [4, 16], "label": "UP", "x":16.25, "y":4.25},
-                {"matrix": [4, 18], "label": "P1", "x":18.5, "y":4.25},
-                {"matrix": [4, 19], "label": "P2", "x":19.5, "y":4.25},
-                {"matrix": [4, 20], "label": "P3", "x":20.5, "y":4.25},
-                {"matrix": [4, 21], "label": "PENT", "x":21.5, "y":4.25, "h":2},
-                
-                {"matrix": [5, 0], "label": "LCTL", "x":0, "y":5.25, "w":1.25},
-                {"matrix": [5, 1], "label": "LGUI", "x":1.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 3], "label": "LALT", "x":2.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 6], "label": "SPC", "x":3.75, "y":5.25, "w":6.25},
-                {"matrix": [5, 10], "label": "RALT", "x":10, "y":5.25, "w":1.25},
-                {"matrix": [5, 11], "label": "RGUI", "x":11.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 13], "label": "MO(1)", "x":12.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 14], "label": "RCTL", "x":13.75, "y":5.25, "w":1.25},
-                {"matrix": [5, 15], "label": "LEFT", "x":15.25, "y":5.25},
-                {"matrix": [5, 16], "label": "DOWN", "x":16.25, "y":5.25},
-                {"matrix": [5, 17], "label": "RGHT", "x":17.25, "y":5.25},
-                {"matrix": [5, 18], "label": "P0", "x":18.5, "y":5.25, "w":2},
-                {"matrix": [5, 20], "label": "PDOT", "x":20.5, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 18], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 20], "x": 20.5, "y": 1.25},
+                {"matrix": [1, 21], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 18], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 19.5, "y": 2.25},
+                {"matrix": [2, 20], "x": 20.5, "y": 2.25},
+                {"matrix": [2, 21], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 18], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 20], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 16], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 18], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 20], "x": 20.5, "y": 4.25},
+                {"matrix": [4, 21], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.25, "y": 5.25},
+
+                {"matrix": [5, 18], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 20], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h
deleted file mode 100644
index ceb873393c..0000000000
--- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Copyright 2021 Cian Johnston
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* Matrix col/row mapping
- *
- *                                                          10     11   12   13   14     15   16   17     18   19   20   21
- *          C0   C1   C2   C3   C4   C5  C6 C7   C8   C9   CA     CB   CC   CD   CE     CF   CG   CH     CI   CJ   CK   CL
- *         ┌───┐     ┌───┐┌───┐┌───┐┌───┐  ┌───┐┌───┐┌───┐┌───┐  ┌───┐┌───┐┌───┐┌───┐  ┌───┐┌───┐┌───┐
- *     R0  │K00│     │K02││K03││K04││K05│  │K07││K08││K09││K0A│  │K0B││K0C││K0D││K0E│  │K0F││K0G││K0H│
- *         └───┘     └───┘└───┘└───┘└───┘  └───┘└───┘└───┘└───┘  └───┘└───┘└───┘└───┘  └───┘└───┘└───┘
- *
- *         ┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───────┐  ┌───┐┌───┐┌───┐  ┌───┐┌───┐┌───┐┌───┐
- *     R1  │K10││K11││K12││K13││K14││K15││K16││K17││K18││K19││K1A││K1B││K1C││  K1E  │  │K1F││K1G││K1H│  │K1I││K1J││K1K││K1L│
- *         └───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────┘  └───┘└───┘└───┘  └───┘└───┘└───┘└───┘
- *         ┌─────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌─────┐  ┌───┐┌───┐┌───┐  ┌───┐┌───┐┌───┐┌───┐
- *     R2  │ K20 ││K22││K23││K24││K25││K26││K27││K28││K29││K2A││K2B││K2C││K2D││ K2E │  │K2F││K2G││K2H│  │K2I││K2J││K2K││   │
- *         └─────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└─────┘  └───┘└───┘└───┘  └───┘└───┘└───┘│K2L│
- *         ┌───────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌────────┐                   ┌───┐┌───┐┌───┐│   │
- *     R3  │  K30  ││K32││K33││K34││K35││K36││K37││K38││K39││K3A││K3B││K3C││  K3D   │                   │K3I││K3J││K3K││   │
- *         └───────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└────────┘                   └───┘└───┘└───┘└───┘
- *         ┌─────────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───────────┐       ┌───┐       ┌───┐┌───┐┌───┐┌───┐
- *     R4  │   K41   ││K42││K43││K44││K45││K46││K47││K48││K49││K4A││K4B││    K4D    │       │K4G│       │K4I││K4J││K4K││   │
- *         └─────────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────────┘       └───┘       └───┘└───┘└───┘│K4L│
- *         ┌────┐┌────┐┌────┐┌──────────────────────────────┐┌────┐┌────┐┌────┐┌────┐  ┌───┐┌───┐┌───┐  ┌────────┐┌───┐│   │
- *     R5  │K50 ││K51 ││K53 ││               K56            ││K5A ││K5B ││K5D ││K5E │  │K5F││K5G││K5H│  │   K5I  ││K5K││   │
- *         └────┘└────┘└────┘└──────────────────────────────┘└────┘└────┘└────┘└────┘  └───┘└───┘└───┘  └────────┘└───┘└───┘
- *
- */
-
-// clang-format off
-#define LAYOUT_fullsize_ansi( \
-    K00,      K02, K03, K04, K05,    K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K0F, K0G, K0H,                       \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E,      K1F, K1G, K1H,   K1I, K1J, K1K, K1L, \
-    K20,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,     K2F, K2G, K2H,   K2I, K2J, K2K, K2L, \
-    K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                          K3I, K3J, K3K,      \
-    K41,     K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D,                 K4G,        K4I, K4J, K4K, K4L, \
-    K50,  K51,  K53,                 K56,             K5A,  K5B,  K5D,  K5E,   K5F, K5G, K5H,      K5I,   K5K       \
-) { \
-    { K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   K0H,   KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E,   K1F,   K1G,   K1H,   K1I,   K1J,   K1K,   K1L   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G,   K2H,   K2I,   K2J,   K2K,   K2L   }, \
-    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO, KC_NO, K3I,   K3J,   K3K,   KC_NO }, \
-    { KC_NO, K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,   KC_NO, KC_NO, K4G,   KC_NO, K4I,   K4J,   K4K,   K4L   }, \
-    { K50,   K51,   KC_NO, K53,   KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   KC_NO, K5D,   K5E,   K5F,   K5G,   K5H,   K5I,   KC_NO, K5K,   KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/linworks/fave104/fave104.h b/keyboards/linworks/fave104/fave104.h
deleted file mode 100644
index bd30b1e0c4..0000000000
--- a/keyboards/linworks/fave104/fave104.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright 2021 Moritz Plattner
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,  K33,  K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,  K75,        K76,                        K77,  K78,  K79,  K80, \
-    K81,  K82,  K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,        K94,          K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  K75,    K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    K94,   K95,   K96,  K98 }, \
-  { K82,    K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
-#define LAYOUT_fullsize_ansi( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,        K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,              K76,                        K77,  K78,  K79,  K80, \
-    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,                      K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  KC_NO,  K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  KC_NO,  K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    KC_NO, K95,   K96,  K98 }, \
-  { KC_NO,  K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
-#define LAYOUT_fullsize_iso( \
-    K00,        K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K10,  K11,        K12,    K13,  K14,  K15,    K16,  K17,  K18,  K19, \
-    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,  K33,  K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
-    K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,                K56,  K57,  K58,    K59,  K60,  K61,  K62, \
-    K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,  K75,        K76,                        K77,  K78,  K79,  K80, \
-    K81,  K82,  K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,        K94,          K95,          K96,  K97,  K98,  K99, \
-    K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
-) { \
-  { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
-  { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
-  { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
-  { K42,    K44,   K46,   K48,   K50,   K52,  K54,    KC_NO, K57,   K59,  K61 }, \
-  { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
-  { K63,    K65,   K67,   K69,   K71,   K73,  K75,    K76,   KC_NO, K77,  K79 }, \
-  { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    K94,   K95,   K96,  K98 }, \
-  { K82,    K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
-  { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
-  { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
-}
-
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index 5421e4d623..e5fcf4f0c8 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -29,371 +29,410 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         },
-
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+                {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         },
-
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
-                {"x":18.5, "y":0},
-                {"x":19.5, "y":0},
-                {"x":20.5, "y":0},
-                {"x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"x":13, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [0, 3], "x": 6.5, "y": 0},
+                {"matrix": [1, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [1, 4], "x": 9.5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"#", "x":12.75, "y":3.25},
-                {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
-                {"label":"+", "x":21.5, "y":3.25},
+                {"matrix": [1, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.25, "y": 0},
+                {"matrix": [1, 8], "x": 17.25, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"x":14, "y":4.25},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
+                {"matrix": [0, 10], "x": 20.5, "y": 0},
+                {"matrix": [1, 10], "x": 21.5, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25},
-                {"label":"0", "x":19.5, "y":5.25},
-                {"label":".", "x":20.5, "y":5.25},
-                {"label":"Enter", "x":21.5, "y":5.25}
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+                {"matrix": [3, 3], "x": 7, "y": 1.25},
+                {"matrix": [2, 4], "x": 8, "y": 1.25},
+                {"matrix": [3, 4], "x": 9, "y": 1.25},
+                {"matrix": [2, 5], "x": 10, "y": 1.25},
+                {"matrix": [3, 5], "x": 11, "y": 1.25},
+                {"matrix": [2, 6], "x": 12, "y": 1.25},
+                {"matrix": [3, 6], "x": 13, "y": 1.25},
+                {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 8], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+                {"matrix": [3, 9], "x": 19.5, "y": 1.25},
+                {"matrix": [2, 10], "x": 20.5, "y": 1.25},
+                {"matrix": [3, 10], "x": 21.5, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [5, 8], "x": 17.25, "y": 2.25},
+
+                {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+                {"matrix": [5, 9], "x": 19.5, "y": 2.25},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.25},
+                {"matrix": [5, 10], "x": 21.5, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+                {"matrix": [6, 7], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+                {"matrix": [7, 9], "x": 19.5, "y": 3.25},
+                {"matrix": [6, 10], "x": 20.5, "y": 3.25},
+                {"matrix": [7, 10], "x": 21.5, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4.25},
+
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+
+                {"matrix": [8, 9], "x": 18.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 19.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 10], "x": 21.5, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 6], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 7], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [11, 7], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 16.25, "y": 5.25},
+                {"matrix": [11, 8], "x": 17.25, "y": 5.25},
+
+                {"matrix": [10, 9], "x": 18.5, "y": 5.25},
+                {"matrix": [11, 9], "x": 19.5, "y": 5.25},
+                {"matrix": [10, 10], "x": 20.5, "y": 5.25},
+                {"matrix": [11, 10], "x": 21.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/ryanskidmore/rskeys100/info.json b/keyboards/ryanskidmore/rskeys100/info.json
index 5bf34ad5e6..2570549742 100644
--- a/keyboards/ryanskidmore/rskeys100/info.json
+++ b/keyboards/ryanskidmore/rskeys100/info.json
@@ -14,116 +14,129 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"PrtSc", "x":15.25, "y":0},
-                {"label":"Scroll Lock", "x":16.25, "y":0},
-                {"label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"`\u00ac", "x":0, "y":1.25},
-                {"label":"1!", "x":1, "y":1.25},
-                {"label":"2\"", "x":2, "y":1.25},
-                {"label":"3\u00a3", "x":3, "y":1.25},
-                {"label":"4$", "x":4, "y":1.25},
-                {"label":"5%", "x":5, "y":1.25},
-                {"label":"6^", "x":6, "y":1.25},
-                {"label":"7&", "x":7, "y":1.25},
-                {"label":"8*", "x":8, "y":1.25},
-                {"label":"9(", "x":9, "y":1.25},
-                {"label":"0)", "x":10, "y":1.25},
-                {"label":"-_", "x":11, "y":1.25},
-                {"label":"=+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.25},
-                {"label":"/", "x":19.5, "y":1.25},
-                {"label":"*", "x":20.5, "y":1.25},
-                {"label":"-", "x":21.5, "y":1.25},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[{", "x":11.5, "y":2.25},
-                {"label":"]}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.25},
-                {"label":"8", "x":19.5, "y":2.25},
-                {"label":"9", "x":20.5, "y":2.25},
-                {"label":"+", "x":21.5, "y":2.25, "h":2},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";:", "x":10.75, "y":3.25},
-                {"label":"'@", "x":11.75, "y":3.25},
-                {"label":"#~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.25},
-                {"label":"5", "x":19.5, "y":3.25},
-                {"label":"6", "x":20.5, "y":3.25},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"\\|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",<", "x":9.25, "y":4.25},
-                {"label":".>", "x":10.25, "y":4.25},
-                {"label":"/?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.25},
-                {"label":"2", "x":19.5, "y":4.25},
-                {"label":"3", "x":20.5, "y":4.25},
-                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "x": 17.25, "y": 0},
 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":15.25, "y":5.25},
-                {"label":"\u2193", "x":16.25, "y":5.25},
-                {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.25, "w":2},
-                {"label":".", "x":20.5, "y":5.25}
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [1, 19], "x": 20.5, "y": 1.25},
+                {"matrix": [1, 20], "x": 21.5, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [2, 19], "x": 20.5, "y": 2.25},
+                {"matrix": [2, 20], "x": 21.5, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 19], "x": 20.5, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 19], "x": 20.5, "y": 4.25},
+                {"matrix": [4, 20], "x": 21.5, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 19], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.c b/keyboards/ryanskidmore/rskeys100/rskeys100.c
index 242ca8641d..4be811b1e2 100644
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.c
+++ b/keyboards/ryanskidmore/rskeys100/rskeys100.c
@@ -1,8 +1,7 @@
 // Copyright 2021 Ryan Skidmore (@ryanskidmore, rskeys@ryanskidmore.co.uk)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "rskeys100.h"
-
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
diff --git a/keyboards/ryanskidmore/rskeys100/rskeys100.h b/keyboards/ryanskidmore/rskeys100/rskeys100.h
deleted file mode 100644
index 12b568d23e..0000000000
--- a/keyboards/ryanskidmore/rskeys100/rskeys100.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2021 Ryan Skidmore (@ryanskidmore, rskeys@ryanskidmore.co.uk)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_fullsize_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, K016, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, K216, K217, K218, K219, K220, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K213,                   K317, K318, K319, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,       K417, K418, K419, K420, \
-	K500,       K502, K503,             K506,                   K510, K511, K512, K513, K514, K515, K516, K517,       K519 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015,  K016,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,  K120,  KC_NO, KC_NO, KC_NO }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,  K220,  KC_NO, KC_NO, KC_NO }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO, KC_NO, KC_NO, K317,  K318,  K319,  KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO, K415,  KC_NO, K417,  K418,  K419,  K420,  KC_NO, KC_NO, KC_NO }, \
-    { K500,  KC_NO, K502,  K503,  KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514,  K515,  K516,  K517,  KC_NO, K519,  KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
diff --git a/keyboards/unicomp/classic_ultracl_pre_2013/info.json b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
index 8423c67555..a8dcd9418f 100644
--- a/keyboards/unicomp/classic_ultracl_pre_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_pre_2013/info.json
@@ -11,2632 +11,389 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 4.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5},
+                {"matrix": [1, 8], "x": 14, "y": 1.5},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 4], "x": 4, "y": 5.5},
+                {"matrix": [7, 13], "x": 5, "y": 5.5, "w": 4.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 14], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 14], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_fullsize_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         }
     }