Merge remote-tracking branch 'origin/develop' into xap

keyboards/buzzard/rev1/info.json

@@ -69,50 +69,6 @@
                 {"matrix": [7, 1], "x": 10, "y": 3},
                 {"matrix": [7, 2], "x": 11, "y": 3}
             ]
-        },
-        "LAYOUT_stack": {
-            "layout": [
-                {"matrix": [0, 4], "x": 0, "y": 0},
-                {"matrix": [0, 3], "x": 1, "y": 0},
-                {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 1], "x": 3, "y": 0},
-                {"matrix": [0, 0], "x": 4, "y": 0},
-                {"matrix": [1, 5], "x": 5, "y": 0},
-                {"matrix": [1, 4], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [1, 2], "x": 8, "y": 0},
-                {"matrix": [1, 1], "x": 9, "y": 0},
-                {"matrix": [1, 0], "x": 10, "y": 0},
-                {"matrix": [2, 5], "x": 11, "y": 0},
-                {"matrix": [2, 4], "x": 12, "y": 0},
-                {"matrix": [2, 3], "x": 13, "y": 0},
-                {"matrix": [2, 2], "x": 14, "y": 0},
-                {"matrix": [2, 1], "x": 15, "y": 0},
-                {"matrix": [2, 0], "x": 16, "y": 0},
-                {"matrix": [3, 2], "x": 17, "y": 0},
-                {"matrix": [3, 1], "x": 18, "y": 0},
-                {"matrix": [3, 0], "x": 19, "y": 0},
-                {"matrix": [4, 0], "x": 20, "y": 0},
-                {"matrix": [4, 1], "x": 21, "y": 0},
-                {"matrix": [4, 2], "x": 22, "y": 0},
-                {"matrix": [4, 3], "x": 23, "y": 0},
-                {"matrix": [4, 4], "x": 24, "y": 0},
-                {"matrix": [5, 0], "x": 25, "y": 0},
-                {"matrix": [5, 1], "x": 26, "y": 0},
-                {"matrix": [5, 2], "x": 27, "y": 0},
-                {"matrix": [5, 3], "x": 28, "y": 0},
-                {"matrix": [5, 4], "x": 29, "y": 0},
-                {"matrix": [5, 5], "x": 30, "y": 0},
-                {"matrix": [6, 0], "x": 31, "y": 0},
-                {"matrix": [6, 1], "x": 32, "y": 0},
-                {"matrix": [6, 2], "x": 33, "y": 0},
-                {"matrix": [6, 3], "x": 34, "y": 0},
-                {"matrix": [6, 4], "x": 35, "y": 0},
-                {"matrix": [6, 5], "x": 36, "y": 0},
-                {"matrix": [7, 0], "x": 37, "y": 0},
-                {"matrix": [7, 1], "x": 38, "y": 0},
-                {"matrix": [7, 2], "x": 39, "y": 0}
-            ]
         }
     }
 }

keyboards/cannonkeys/an_c/info.json

@@ -182,54 +182,58 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 14], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 14], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 5], "x": 58, "y": 0},
-                {"matrix": [4, 9], "x": 59, "y": 0},
-                {"matrix": [4, 10], "x": 60, "y": 0},
-                {"matrix": [4, 11], "x": 61, "y": 0},
-                {"matrix": [4, 14], "x": 62, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w" : 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }

keyboards/cannonkeys/instant60/info.json

@@ -182,54 +182,58 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 14], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 14], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 5], "x": 58, "y": 0},
-                {"matrix": [4, 9], "x": 59, "y": 0},
-                {"matrix": [4, 10], "x": 60, "y": 0},
-                {"matrix": [4, 11], "x": 61, "y": 0},
-                {"matrix": [4, 14], "x": 62, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }

keyboards/cannonkeys/satisfaction75/prototype/info.json

@@ -3,96 +3,105 @@
         "LAYOUT_all": {
             "layout": [
                 {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K002", "matrix": [0, 2], "x": 1, "y": 0},
-                {"label": "K003", "matrix": [0, 3], "x": 2, "y": 0},
-                {"label": "K004", "matrix": [0, 4], "x": 3, "y": 0},
-                {"label": "K005", "matrix": [0, 5], "x": 4, "y": 0},
-                {"label": "K006", "matrix": [0, 6], "x": 5, "y": 0},
-                {"label": "K007", "matrix": [0, 7], "x": 6, "y": 0},
-                {"label": "K008", "matrix": [0, 8], "x": 7, "y": 0},
-                {"label": "K009", "matrix": [0, 9], "x": 8, "y": 0},
-                {"label": "K010", "matrix": [0, 10], "x": 9, "y": 0},
-                {"label": "K011", "matrix": [0, 11], "x": 10, "y": 0},
-                {"label": "K012", "matrix": [0, 12], "x": 11, "y": 0},
-                {"label": "K013", "matrix": [0, 13], "x": 12, "y": 0},
-
-                {"label": "K100", "matrix": [1, 0], "x": 13, "y": 0},
-                {"label": "K101", "matrix": [1, 1], "x": 14, "y": 0},
-                {"label": "K102", "matrix": [1, 2], "x": 15, "y": 0},
-                {"label": "K103", "matrix": [1, 3], "x": 16, "y": 0},
-                {"label": "K104", "matrix": [1, 4], "x": 17, "y": 0},
-                {"label": "K105", "matrix": [1, 5], "x": 18, "y": 0},
-                {"label": "K106", "matrix": [1, 6], "x": 19, "y": 0},
-                {"label": "K107", "matrix": [1, 7], "x": 20, "y": 0},
-                {"label": "K108", "matrix": [1, 8], "x": 21, "y": 0},
-                {"label": "K109", "matrix": [1, 9], "x": 22, "y": 0},
-                {"label": "K110", "matrix": [1, 10], "x": 23, "y": 0},
-                {"label": "K111", "matrix": [1, 11], "x": 24, "y": 0},
-                {"label": "K112", "matrix": [1, 12], "x": 25, "y": 0},
-                {"label": "K113", "matrix": [1, 13], "x": 26, "y": 0},
-                {"label": "K114", "matrix": [1, 14], "x": 27, "y": 0},
-                {"label": "K115", "matrix": [1, 15], "x": 28, "y": 0},
-
-                {"label": "K200", "matrix": [2, 0], "x": 29, "y": 0},
-                {"label": "K201", "matrix": [2, 1], "x": 30, "y": 0},
-                {"label": "K202", "matrix": [2, 2], "x": 31, "y": 0},
-                {"label": "K203", "matrix": [2, 3], "x": 32, "y": 0},
-                {"label": "K204", "matrix": [2, 4], "x": 33, "y": 0},
-                {"label": "K205", "matrix": [2, 5], "x": 34, "y": 0},
-                {"label": "K206", "matrix": [2, 6], "x": 35, "y": 0},
-                {"label": "K207", "matrix": [2, 7], "x": 36, "y": 0},
-                {"label": "K208", "matrix": [2, 8], "x": 37, "y": 0},
-                {"label": "K209", "matrix": [2, 9], "x": 38, "y": 0},
-                {"label": "K210", "matrix": [2, 10], "x": 39, "y": 0},
-                {"label": "K211", "matrix": [2, 11], "x": 40, "y": 0},
-                {"label": "K212", "matrix": [2, 12], "x": 41, "y": 0},
-                {"label": "K213", "matrix": [2, 13], "x": 42, "y": 0},
-                {"label": "K215", "matrix": [2, 15], "x": 43, "y": 0},
-
-                {"label": "K300", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K301", "matrix": [3, 1], "x": 45, "y": 0},
-                {"label": "K302", "matrix": [3, 2], "x": 46, "y": 0},
-                {"label": "K303", "matrix": [3, 3], "x": 47, "y": 0},
-                {"label": "K304", "matrix": [3, 4], "x": 48, "y": 0},
-                {"label": "K305", "matrix": [3, 5], "x": 49, "y": 0},
-                {"label": "K306", "matrix": [3, 6], "x": 50, "y": 0},
-                {"label": "K307", "matrix": [3, 7], "x": 51, "y": 0},
-                {"label": "K308", "matrix": [3, 8], "x": 52, "y": 0},
-                {"label": "K309", "matrix": [3, 9], "x": 53, "y": 0},
-                {"label": "K310", "matrix": [3, 10], "x": 54, "y": 0},
-                {"label": "K311", "matrix": [3, 11], "x": 55, "y": 0},
-                {"label": "K312", "matrix": [3, 12], "x": 56, "y": 0},
-                {"label": "K313", "matrix": [3, 13], "x": 57, "y": 0},
-                {"label": "K315", "matrix": [3, 15], "x": 58, "y": 0},
-
-                {"label": "K400", "matrix": [4, 0], "x": 59, "y": 0},
-                {"label": "K401", "matrix": [4, 1], "x": 60, "y": 0},
-                {"label": "K402", "matrix": [4, 2], "x": 61, "y": 0},
-                {"label": "K403", "matrix": [4, 3], "x": 62, "y": 0},
-                {"label": "K404", "matrix": [4, 4], "x": 63, "y": 0},
-                {"label": "K405", "matrix": [4, 5], "x": 64, "y": 0},
-                {"label": "K406", "matrix": [4, 6], "x": 65, "y": 0},
-                {"label": "K407", "matrix": [4, 7], "x": 66, "y": 0},
-                {"label": "K408", "matrix": [4, 8], "x": 67, "y": 0},
-                {"label": "K409", "matrix": [4, 9], "x": 68, "y": 0},
-                {"label": "K410", "matrix": [4, 10], "x": 69, "y": 0},
-                {"label": "K411", "matrix": [4, 11], "x": 70, "y": 0},
-                {"label": "K412", "matrix": [4, 12], "x": 71, "y": 0},
-                {"label": "K413", "matrix": [4, 13], "x": 72, "y": 0},
-                {"label": "K415", "matrix": [4, 15], "x": 73, "y": 0},
-
-                {"label": "K500", "matrix": [5, 0], "x": 74, "y": 0},
-                {"label": "K501", "matrix": [5, 1], "x": 75, "y": 0},
-                {"label": "K502", "matrix": [5, 2], "x": 76, "y": 0},
-                {"label": "K503", "matrix": [5, 3], "x": 77, "y": 0},
-                {"label": "K505", "matrix": [5, 5], "x": 78, "y": 0},
-                {"label": "K507", "matrix": [5, 7], "x": 79, "y": 0},
-                {"label": "K509", "matrix": [5, 9], "x": 80, "y": 0},
-                {"label": "K510", "matrix": [5, 10], "x": 81, "y": 0},
-                {"label": "K511", "matrix": [5, 11], "x": 82, "y": 0},
-                {"label": "K512", "matrix": [5, 12], "x": 83, "y": 0},
-                {"label": "K513", "matrix": [5, 13], "x": 84, "y": 0},
-                {"label": "K515", "matrix": [5, 15], "x": 85, "y": 0}
+
+                {"label": "K002", "matrix": [0, 2], "x": 1.5, "y": 0},
+                {"label": "K003", "matrix": [0, 3], "x": 2.5, "y": 0},
+                {"label": "K004", "matrix": [0, 4], "x": 3.5, "y": 0},
+                {"label": "K005", "matrix": [0, 5], "x": 4.5, "y": 0},
+
+                {"label": "K006", "matrix": [0, 6], "x": 5.75, "y": 0},
+                {"label": "K007", "matrix": [0, 7], "x": 6.75, "y": 0},
+                {"label": "K008", "matrix": [0, 8], "x": 7.75, "y": 0},
+                {"label": "K009", "matrix": [0, 9], "x": 8.75, "y": 0},
+
+                {"label": "K010", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K011", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K012", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "K013", "matrix": [0, 13], "x": 13, "y": 0},
+
+                {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.25},
+                {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.25},
+                {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.25},
+                {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.25},
+                {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.25},
+                {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.25},
+                {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.25},
+                {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.25},
+                {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.25},
+                {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.25},
+                {"label": "K114", "matrix": [1, 14], "x": 14, "y": 1.25},
+
+                {"label": "K115", "matrix": [1, 15], "x": 15.5, "y": 1},
+
+                {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"label": "K215", "matrix": [2, 15], "x": 15.5, "y": 2.25},
+
+                {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"label": "K313", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"label": "K315", "matrix": [3, 15], "x": 15.5, "y": 3.25},
+
+                {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "K401", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"label": "K402", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"label": "K403", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"label": "K404", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"label": "K405", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"label": "K406", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"label": "K407", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"label": "K408", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"label": "K409", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"label": "K410", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"label": "K411", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"label": "K412", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+                {"label": "K413", "matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+                {"label": "K415", "matrix": [4, 15], "x": 15.5, "y": 4.25},
+
+                {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K503", "matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 2.25},
+                {"label": "K505", "matrix": [5, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"label": "K507", "matrix": [5, 7], "x": 7.25, "y": 5.25, "w": 2.75},
+                {"label": "K509", "matrix": [5, 9], "x": 10, "y": 5.25},
+                {"label": "K510", "matrix": [5, 10], "x": 11, "y": 5.25},
+                {"label": "K511", "matrix": [5, 11], "x": 12, "y": 5.25},
+
+                {"label": "K512", "matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"label": "K513", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"label": "K515", "matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         },
         "LAYOUT_default": {

keyboards/cutie_club/wraith/info.json

@@ -19,92 +19,10 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_iso"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0},
-                {"matrix": [0, 7], "x": 14, "y": 0},
-                {"matrix": [2, 0], "x": 15, "y": 0},
-                {"matrix": [3, 0], "x": 16, "y": 0},
-                {"matrix": [2, 1], "x": 17, "y": 0},
-                {"matrix": [3, 1], "x": 18, "y": 0},
-                {"matrix": [2, 2], "x": 19, "y": 0},
-                {"matrix": [3, 2], "x": 20, "y": 0},
-                {"matrix": [2, 3], "x": 21, "y": 0},
-                {"matrix": [3, 3], "x": 22, "y": 0},
-                {"matrix": [2, 4], "x": 23, "y": 0},
-                {"matrix": [3, 4], "x": 24, "y": 0},
-                {"matrix": [2, 5], "x": 25, "y": 0},
-                {"matrix": [3, 5], "x": 26, "y": 0},
-                {"matrix": [2, 6], "x": 27, "y": 0},
-                {"matrix": [3, 6], "x": 28, "y": 0},
-                {"matrix": [2, 7], "x": 29, "y": 0},
-                {"matrix": [4, 0], "x": 30, "y": 0},
-                {"matrix": [5, 0], "x": 31, "y": 0},
-                {"matrix": [4, 1], "x": 32, "y": 0},
-                {"matrix": [5, 1], "x": 33, "y": 0},
-                {"matrix": [4, 2], "x": 34, "y": 0},
-                {"matrix": [5, 2], "x": 35, "y": 0},
-                {"matrix": [4, 3], "x": 36, "y": 0},
-                {"matrix": [5, 3], "x": 37, "y": 0},
-                {"matrix": [4, 4], "x": 38, "y": 0},
-                {"matrix": [5, 4], "x": 39, "y": 0},
-                {"matrix": [4, 5], "x": 40, "y": 0},
-                {"matrix": [5, 5], "x": 41, "y": 0},
-                {"matrix": [4, 6], "x": 42, "y": 0},
-                {"matrix": [4, 7], "x": 43, "y": 0},
-                {"matrix": [6, 0], "x": 44, "y": 0},
-                {"matrix": [7, 0], "x": 45, "y": 0},
-                {"matrix": [6, 1], "x": 46, "y": 0},
-                {"matrix": [7, 1], "x": 47, "y": 0},
-                {"matrix": [6, 2], "x": 48, "y": 0},
-                {"matrix": [7, 2], "x": 49, "y": 0},
-                {"matrix": [6, 3], "x": 50, "y": 0},
-                {"matrix": [7, 3], "x": 51, "y": 0},
-                {"matrix": [6, 4], "x": 52, "y": 0},
-                {"matrix": [7, 4], "x": 53, "y": 0},
-                {"matrix": [6, 5], "x": 54, "y": 0},
-                {"matrix": [7, 5], "x": 55, "y": 0},
-                {"matrix": [6, 6], "x": 56, "y": 0},
-                {"matrix": [7, 6], "x": 57, "y": 0},
-                {"matrix": [6, 7], "x": 58, "y": 0},
-                {"matrix": [8, 0], "x": 59, "y": 0},
-                {"matrix": [9, 0], "x": 60, "y": 0},
-                {"matrix": [8, 1], "x": 61, "y": 0},
-                {"matrix": [9, 1], "x": 62, "y": 0},
-                {"matrix": [8, 2], "x": 63, "y": 0},
-                {"matrix": [9, 2], "x": 64, "y": 0},
-                {"matrix": [8, 3], "x": 65, "y": 0},
-                {"matrix": [9, 3], "x": 66, "y": 0},
-                {"matrix": [8, 4], "x": 67, "y": 0},
-                {"matrix": [9, 4], "x": 68, "y": 0},
-                {"matrix": [8, 5], "x": 69, "y": 0},
-                {"matrix": [9, 5], "x": 70, "y": 0},
-                {"matrix": [8, 6], "x": 71, "y": 0},
-                {"matrix": [9, 6], "x": 72, "y": 0},
-                {"matrix": [8, 7], "x": 73, "y": 0},
-                {"matrix": [10, 0], "x": 74, "y": 0},
-                {"matrix": [10, 1], "x": 75, "y": 0},
-                {"matrix": [10, 3], "x": 76, "y": 0},
-                {"matrix": [11, 5], "x": 77, "y": 0},
-                {"matrix": [10, 6], "x": 78, "y": 0},
-                {"matrix": [11, 6], "x": 79, "y": 0},
-                {"matrix": [10, 7], "x": 80, "y": 0}
-            ]
-        },
         "LAYOUT_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},

keyboards/dp60/info.json

@@ -456,56 +456,60 @@
                 {"matrix": [0, 11], "x": 12, "y": 0},
                 {"matrix": [0, 12], "x": 13, "y": 0},
                 {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [4, 0], "x": 57, "y": 0},
-                {"matrix": [4, 1], "x": 58, "y": 0},
-                {"matrix": [4, 2], "x": 59, "y": 0},
-                {"matrix": [4, 6], "x": 60, "y": 0},
-                {"matrix": [4, 10], "x": 61, "y": 0},
-                {"matrix": [4, 11], "x": 62, "y": 0},
-                {"matrix": [4, 12], "x": 63, "y": 0},
-                {"matrix": [4, 13], "x": 64, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }

keyboards/exclusive/e65/info.json

@@ -47,61 +47,62 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 4},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.5, "y": 4},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_noblocker": {
@@ -123,61 +124,61 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 3, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wk": {
@@ -199,61 +200,62 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 6], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_7u_wkl": {
@@ -275,60 +277,61 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 13], "x": 64, "y": 0},
-                {"matrix": [4, 14], "x": 65, "y": 0},
-                {"matrix": [4, 15], "x": 66, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_blocker": {
@@ -350,62 +353,63 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 6], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0},
-                {"matrix": [4, 15], "x": 68, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_all_noblocker": {
@@ -427,62 +431,62 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 6], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0},
-                {"matrix": [4, 15], "x": 68, "y": 0}
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_7u_hhkb": {

keyboards/giabalanai/info.json

@@ -179,114 +179,123 @@
                 {"matrix": [2, 5], "x": 9, "y": 0},
                 {"matrix": [1, 5], "x": 10, "y": 0},
                 {"matrix": [0, 5], "x": 11, "y": 0},
-                {"matrix": [0, 1], "x": 12, "y": 0},
-                {"matrix": [1, 1], "x": 13, "y": 0},
-                {"matrix": [2, 1], "x": 14, "y": 0},
-                {"matrix": [3, 1], "x": 15, "y": 0},
-                {"matrix": [4, 1], "x": 16, "y": 0},
-                {"matrix": [5, 1], "x": 17, "y": 0},
-                {"matrix": [5, 6], "x": 18, "y": 0},
-                {"matrix": [4, 6], "x": 19, "y": 0},
-                {"matrix": [3, 6], "x": 20, "y": 0},
-                {"matrix": [2, 6], "x": 21, "y": 0},
-                {"matrix": [1, 6], "x": 22, "y": 0},
-                {"matrix": [0, 6], "x": 23, "y": 0},
-                {"matrix": [0, 2], "x": 24, "y": 0},
-                {"matrix": [1, 2], "x": 25, "y": 0},
-                {"matrix": [2, 2], "x": 26, "y": 0},
-                {"matrix": [3, 2], "x": 27, "y": 0},
-                {"matrix": [4, 2], "x": 28, "y": 0},
-                {"matrix": [5, 2], "x": 29, "y": 0},
-                {"matrix": [5, 7], "x": 30, "y": 0},
-                {"matrix": [4, 7], "x": 31, "y": 0},
-                {"matrix": [3, 7], "x": 32, "y": 0},
-                {"matrix": [2, 7], "x": 33, "y": 0},
-                {"matrix": [1, 7], "x": 34, "y": 0},
-                {"matrix": [0, 7], "x": 35, "y": 0},
-                {"matrix": [0, 3], "x": 36, "y": 0},
-                {"matrix": [1, 3], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [3, 3], "x": 39, "y": 0},
-                {"matrix": [4, 3], "x": 40, "y": 0},
-                {"matrix": [5, 3], "x": 41, "y": 0},
-                {"matrix": [5, 8], "x": 42, "y": 0},
-                {"matrix": [4, 8], "x": 43, "y": 0},
-                {"matrix": [3, 8], "x": 44, "y": 0},
-                {"matrix": [2, 8], "x": 45, "y": 0},
-                {"matrix": [1, 8], "x": 46, "y": 0},
-                {"matrix": [0, 8], "x": 47, "y": 0},
-                {"matrix": [0, 4], "x": 48, "y": 0},
-                {"matrix": [1, 4], "x": 49, "y": 0},
-                {"matrix": [2, 4], "x": 50, "y": 0},
-                {"matrix": [3, 4], "x": 51, "y": 0},
-                {"matrix": [4, 4], "x": 52, "y": 0},
-                {"matrix": [5, 4], "x": 53, "y": 0},
-                {"matrix": [5, 9], "x": 54, "y": 0},
-                {"matrix": [4, 9], "x": 55, "y": 0},
-                {"matrix": [3, 9], "x": 56, "y": 0},
-                {"matrix": [2, 9], "x": 57, "y": 0},
-                {"matrix": [1, 9], "x": 58, "y": 0},
-                {"matrix": [0, 9], "x": 59, "y": 0},
-                {"matrix": [6, 9], "x": 60, "y": 0},
-                {"matrix": [7, 9], "x": 61, "y": 0},
-                {"matrix": [8, 9], "x": 62, "y": 0},
-                {"matrix": [9, 9], "x": 63, "y": 0},
-                {"matrix": [10, 9], "x": 64, "y": 0},
-                {"matrix": [11, 9], "x": 65, "y": 0},
-                {"matrix": [11, 4], "x": 66, "y": 0},
-                {"matrix": [10, 4], "x": 67, "y": 0},
-                {"matrix": [9, 4], "x": 68, "y": 0},
-                {"matrix": [8, 4], "x": 69, "y": 0},
-                {"matrix": [7, 4], "x": 70, "y": 0},
-                {"matrix": [6, 4], "x": 71, "y": 0},
-                {"matrix": [6, 8], "x": 72, "y": 0},
-                {"matrix": [7, 8], "x": 73, "y": 0},
-                {"matrix": [8, 8], "x": 74, "y": 0},
-                {"matrix": [9, 8], "x": 75, "y": 0},
-                {"matrix": [10, 8], "x": 76, "y": 0},
-                {"matrix": [11, 8], "x": 77, "y": 0},
-                {"matrix": [11, 3], "x": 78, "y": 0},
-                {"matrix": [10, 3], "x": 79, "y": 0},
-                {"matrix": [9, 3], "x": 80, "y": 0},
-                {"matrix": [8, 3], "x": 81, "y": 0},
-                {"matrix": [7, 3], "x": 82, "y": 0},
-                {"matrix": [6, 3], "x": 83, "y": 0},
-                {"matrix": [6, 7], "x": 84, "y": 0},
-                {"matrix": [7, 7], "x": 85, "y": 0},
-                {"matrix": [8, 7], "x": 86, "y": 0},
-                {"matrix": [9, 7], "x": 87, "y": 0},
-                {"matrix": [10, 7], "x": 88, "y": 0},
-                {"matrix": [11, 7], "x": 89, "y": 0},
-                {"matrix": [11, 2], "x": 90, "y": 0},
-                {"matrix": [10, 2], "x": 91, "y": 0},
-                {"matrix": [9, 2], "x": 92, "y": 0},
-                {"matrix": [8, 2], "x": 93, "y": 0},
-                {"matrix": [7, 2], "x": 94, "y": 0},
-                {"matrix": [6, 2], "x": 95, "y": 0},
-                {"matrix": [6, 6], "x": 96, "y": 0},
-                {"matrix": [7, 6], "x": 97, "y": 0},
-                {"matrix": [8, 6], "x": 98, "y": 0},
-                {"matrix": [9, 6], "x": 99, "y": 0},
-                {"matrix": [10, 6], "x": 100, "y": 0},
-                {"matrix": [11, 6], "x": 101, "y": 0},
-                {"matrix": [11, 1], "x": 102, "y": 0},
-                {"matrix": [10, 1], "x": 103, "y": 0},
-                {"matrix": [9, 1], "x": 104, "y": 0},
-                {"matrix": [8, 1], "x": 105, "y": 0},
-                {"matrix": [7, 1], "x": 106, "y": 0},
-                {"matrix": [6, 1], "x": 107, "y": 0},
-                {"matrix": [6, 5], "x": 108, "y": 0},
-                {"matrix": [7, 5], "x": 109, "y": 0},
-                {"matrix": [8, 5], "x": 110, "y": 0},
-                {"matrix": [9, 5], "x": 111, "y": 0},
-                {"matrix": [10, 5], "x": 112, "y": 0},
-                {"matrix": [11, 5], "x": 113, "y": 0},
-                {"matrix": [11, 0], "x": 114, "y": 0},
-                {"matrix": [10, 0], "x": 115, "y": 0},
-                {"matrix": [9, 0], "x": 116, "y": 0},
-                {"matrix": [8, 0], "x": 117, "y": 0},
-                {"matrix": [7, 0], "x": 118, "y": 0},
-                {"matrix": [6, 0], "x": 119, "y": 0}
+
+                {"matrix": [0, 1], "x": 0.5, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [4, 1], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 6], "x": 6.5, "y": 1},
+                {"matrix": [4, 6], "x": 7.5, "y": 1},
+                {"matrix": [3, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 6], "x": 10.5, "y": 1},
+                {"matrix": [0, 6], "x": 11.5, "y": 1},
+
+                {"matrix": [0, 2], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [5, 7], "x": 7, "y": 2},
+                {"matrix": [4, 7], "x": 8, "y": 2},
+                {"matrix": [3, 7], "x": 9, "y": 2},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [1, 7], "x": 11, "y": 2},
+                {"matrix": [0, 7], "x": 12, "y": 2},
+
+                {"matrix": [0, 3], "x": 1.5, "y": 3},
+                {"matrix": [1, 3], "x": 2.5, "y": 3},
+                {"matrix": [2, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [4, 3], "x": 5.5, "y": 3},
+                {"matrix": [5, 3], "x": 6.5, "y": 3},
+                {"matrix": [5, 8], "x": 7.5, "y": 3},
+                {"matrix": [4, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 8], "x": 9.5, "y": 3},
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [1, 8], "x": 11.5, "y": 3},
+                {"matrix": [0, 8], "x": 12.5, "y": 3},
+
+                {"matrix": [0, 4], "x": 2, "y": 4},
+                {"matrix": [1, 4], "x": 3, "y": 4},
+                {"matrix": [2, 4], "x": 4, "y": 4},
+                {"matrix": [3, 4], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [5, 4], "x": 7, "y": 4},
+                {"matrix": [5, 9], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [3, 9], "x": 10, "y": 4},
+                {"matrix": [2, 9], "x": 11, "y": 4},
+                {"matrix": [1, 9], "x": 12, "y": 4},
+                {"matrix": [0, 9], "x": 13, "y": 4},
+
+                {"matrix": [6, 9], "x": 0, "y": 6},
+                {"matrix": [7, 9], "x": 1, "y": 6},
+                {"matrix": [8, 9], "x": 2, "y": 6},
+                {"matrix": [9, 9], "x": 3, "y": 6},
+                {"matrix": [10, 9], "x": 4, "y": 6},
+                {"matrix": [11, 9], "x": 5, "y": 6},
+                {"matrix": [11, 4], "x": 6, "y": 6},
+                {"matrix": [10, 4], "x": 7, "y": 6},
+                {"matrix": [9, 4], "x": 8, "y": 6},
+                {"matrix": [8, 4], "x": 9, "y": 6},
+                {"matrix": [7, 4], "x": 10, "y": 6},
+                {"matrix": [6, 4], "x": 11, "y": 6},
+
+                {"matrix": [6, 8], "x": 0.5, "y": 7},
+                {"matrix": [7, 8], "x": 1.5, "y": 7},
+                {"matrix": [8, 8], "x": 2.5, "y": 7},
+                {"matrix": [9, 8], "x": 3.5, "y": 7},
+                {"matrix": [10, 8], "x": 4.5, "y": 7},
+                {"matrix": [11, 8], "x": 5.5, "y": 7},
+                {"matrix": [11, 3], "x": 6.5, "y": 7},
+                {"matrix": [10, 3], "x": 7.5, "y": 7},
+                {"matrix": [9, 3], "x": 8.5, "y": 7},
+                {"matrix": [8, 3], "x": 9.5, "y": 7},
+                {"matrix": [7, 3], "x": 10.5, "y": 7},
+                {"matrix": [6, 3], "x": 11.5, "y": 7},
+
+                {"matrix": [6, 7], "x": 1, "y": 8},
+                {"matrix": [7, 7], "x": 2, "y": 8},
+                {"matrix": [8, 7], "x": 3, "y": 8},
+                {"matrix": [9, 7], "x": 4, "y": 8},
+                {"matrix": [10, 7], "x": 5, "y": 8},
+                {"matrix": [11, 7], "x": 6, "y": 8},
+                {"matrix": [11, 2], "x": 7, "y": 8},
+                {"matrix": [10, 2], "x": 8, "y": 8},
+                {"matrix": [9, 2], "x": 9, "y": 8},
+                {"matrix": [8, 2], "x": 10, "y": 8},
+                {"matrix": [7, 2], "x": 11, "y": 8},
+                {"matrix": [6, 2], "x": 12, "y": 8},
+
+                {"matrix": [6, 6], "x": 1.5, "y": 9},
+                {"matrix": [7, 6], "x": 2.5, "y": 9},
+                {"matrix": [8, 6], "x": 3.5, "y": 9},
+                {"matrix": [9, 6], "x": 4.5, "y": 9},
+                {"matrix": [10, 6], "x": 5.5, "y": 9},
+                {"matrix": [11, 6], "x": 6.5, "y": 9},
+                {"matrix": [11, 1], "x": 7.5, "y": 9},
+                {"matrix": [10, 1], "x": 8.5, "y": 9},
+                {"matrix": [9, 1], "x": 9.5, "y": 9},
+                {"matrix": [8, 1], "x": 10.5, "y": 9},
+                {"matrix": [7, 1], "x": 11.5, "y": 9},
+                {"matrix": [6, 1], "x": 12.5, "y": 9},
+
+                {"matrix": [6, 5], "x": 2, "y": 10},
+                {"matrix": [7, 5], "x": 3, "y": 10},
+                {"matrix": [8, 5], "x": 4, "y": 10},
+                {"matrix": [9, 5], "x": 5, "y": 10},
+                {"matrix": [10, 5], "x": 6, "y": 10},
+                {"matrix": [11, 5], "x": 7, "y": 10},
+                {"matrix": [11, 0], "x": 8, "y": 10},
+                {"matrix": [10, 0], "x": 9, "y": 10},
+                {"matrix": [9, 0], "x": 10, "y": 10},
+                {"matrix": [8, 0], "x": 11, "y": 10},
+                {"matrix": [7, 0], "x": 12, "y": 10},
+                {"matrix": [6, 0], "x": 13, "y": 10}
             ]
         }
     }

keyboards/hineybush/h60/info.json

@@ -388,56 +388,62 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [2, 13], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 12], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 3], "x": 58, "y": 0},
-                {"matrix": [4, 6], "x": 59, "y": 0},
-                {"matrix": [4, 8], "x": 60, "y": 0},
-                {"matrix": [4, 9], "x": 61, "y": 0},
-                {"matrix": [4, 10], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [4, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 13], "x": 1.25, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }

keyboards/hineybush/h60/keymaps/via/keymap.c

@@ -4,29 +4,18 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_TRNS,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    KC_TRNS,
-    KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS,                   KC_SPC,           KC_TRNS, KC_RALT, MO(1),    KC_RGUI,    KC_RCTL),
-    LAYOUT_all(
-    KC_TRNS, BL_TOGG, BL_DOWN, BL_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_MPLY,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
     LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  _______, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, _______,
+        KC_LCTL, KC_LGUI, KC_LALT,          _______,          KC_SPC,           _______,          KC_RALT, MO(1),   KC_RGUI, KC_RCTL
+    ),
     LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        _______, BL_TOGG, BL_DOWN, BL_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,          _______,          KC_MPLY,          _______,          _______, _______, _______, _______
+    )
 };

keyboards/hineybush/h660s/info.json

@@ -40,7 +40,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -57,7 +57,7 @@
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
                 {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -84,21 +84,21 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_split_bs": {
@@ -119,7 +119,7 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -136,7 +136,7 @@
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
                 {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -163,21 +163,21 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
-
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_rwkl": {
@@ -197,7 +197,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -214,7 +214,7 @@
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
                 {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -241,20 +241,20 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_ansi_rwkl_split_bs": {
@@ -275,7 +275,7 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -292,7 +292,7 @@
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
                 {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -319,20 +319,20 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso": {
@@ -352,7 +352,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -368,7 +368,7 @@
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -397,9 +397,9 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
@@ -409,9 +409,9 @@
                 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_split_bs": {
@@ -432,7 +432,7 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -448,7 +448,7 @@
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -477,9 +477,9 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
                 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
@@ -489,9 +489,9 @@
                 {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
                 {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_rwkl": {
@@ -511,7 +511,7 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -527,7 +527,7 @@
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -556,20 +556,20 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_66_iso_rwkl_split_bs": {
@@ -590,7 +590,7 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
 
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
@@ -606,7 +606,7 @@
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix": [1, 14], "x": 16.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
 
                 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
@@ -635,20 +635,20 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
 
-                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
 
-                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 7},
-                {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
-                {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4},
 
-                {"matrix": [4, 12], "x": 14.25, "y": 4.25},
-                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
-                {"matrix": [4, 14], "x": 16.25, "y": 4.25}
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         },
         "LAYOUT_all": {
@@ -668,64 +668,68 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [1, 13], "x": 14, "y": 0},
-                {"matrix": [0, 14], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [1, 6], "x": 22, "y": 0},
-                {"matrix": [1, 7], "x": 23, "y": 0},
-                {"matrix": [1, 8], "x": 24, "y": 0},
-                {"matrix": [1, 9], "x": 25, "y": 0},
-                {"matrix": [1, 10], "x": 26, "y": 0},
-                {"matrix": [1, 11], "x": 27, "y": 0},
-                {"matrix": [1, 12], "x": 28, "y": 0},
-                {"matrix": [2, 13], "x": 29, "y": 0},
-                {"matrix": [1, 14], "x": 30, "y": 0},
-
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 1], "x": 32, "y": 0},
-                {"matrix": [2, 2], "x": 33, "y": 0},
-                {"matrix": [2, 3], "x": 34, "y": 0},
-                {"matrix": [2, 4], "x": 35, "y": 0},
-                {"matrix": [2, 5], "x": 36, "y": 0},
-                {"matrix": [2, 6], "x": 37, "y": 0},
-                {"matrix": [2, 7], "x": 38, "y": 0},
-                {"matrix": [2, 8], "x": 39, "y": 0},
-                {"matrix": [2, 9], "x": 40, "y": 0},
-                {"matrix": [2, 10], "x": 41, "y": 0},
-                {"matrix": [2, 11], "x": 42, "y": 0},
-                {"matrix": [2, 12], "x": 43, "y": 0},
-                {"matrix": [3, 13], "x": 44, "y": 0},
-
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 12], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 9], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 12], "x": 66, "y": 0},
-                {"matrix": [4, 13], "x": 67, "y": 0},
-                {"matrix": [4, 14], "x": 68, "y": 0}
+
+                {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 15.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 14.75, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.25}
             ]
         }
     }

keyboards/ibnuda/squiggle/rev1/info.json

@@ -118,98 +118,98 @@
         },
         "LAYOUT_full": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
                 {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
 
-                {"matrix": [4, 4], "x": 5, "y": 0},
-                {"matrix": [4, 3], "x": 6, "y": 0},
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
                 {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 0], "x": 9, "y": 0},
-
-                {"matrix": [1, 0], "x": 10, "y": 0},
-                {"matrix": [1, 1], "x": 11, "y": 0},
-                {"matrix": [1, 2], "x": 12, "y": 0},
-                {"matrix": [1, 3], "x": 13, "y": 0},
-                {"matrix": [1, 4], "x": 14, "y": 0},
-
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 3], "x": 16, "y": 0},
-                {"matrix": [5, 2], "x": 17, "y": 0},
-                {"matrix": [5, 1], "x": 18, "y": 0},
-                {"matrix": [5, 0], "x": 19, "y": 0},
-
-                {"matrix": [2, 0], "x": 20, "y": 0},
-                {"matrix": [2, 1], "x": 21, "y": 0},
-                {"matrix": [2, 2], "x": 22, "y": 0},
-                {"matrix": [2, 3], "x": 23, "y": 0},
-                {"matrix": [2, 4], "x": 24, "y": 0},
-
-                {"matrix": [6, 4], "x": 25, "y": 0},
-                {"matrix": [6, 3], "x": 26, "y": 0},
-                {"matrix": [6, 2], "x": 27, "y": 0},
-                {"matrix": [6, 1], "x": 28, "y": 0},
-                {"matrix": [6, 0], "x": 29, "y": 0},
-
-                {"matrix": [3, 0], "x": 30, "y": 0},
-                {"matrix": [3, 1], "x": 31, "y": 0},
-                {"matrix": [3, 2], "x": 32, "y": 0},
-                {"matrix": [3, 3], "x": 33, "y": 0},
-                {"matrix": [3, 4], "x": 34, "y": 0},
-
-                {"matrix": [7, 4], "x": 35, "y": 0},
-                {"matrix": [7, 3], "x": 36, "y": 0},
-                {"matrix": [7, 2], "x": 37, "y": 0},
-                {"matrix": [7, 1], "x": 38, "y": 0},
-                {"matrix": [7, 0], "x": 39, "y": 0}
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.9},
+                {"matrix": [3, 1], "x": 1, "y": 3.2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.1},
+                {"matrix": [3, 4], "x": 4, "y": 3.15},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.15},
+                {"matrix": [7, 3], "x": 6, "y": 3.1},
+                {"matrix": [7, 2], "x": 7, "y": 3},
+                {"matrix": [7, 1], "x": 8, "y": 3.2},
+                {"matrix": [7, 0], "x": 9, "y": 3.9}
             ]
         },
         "LAYOUT_reversed": {
             "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0},
-                {"matrix": [4, 1], "x": 1, "y": 0},
+                {"matrix": [4, 0], "x": 0, "y": 0.9},
+                {"matrix": [4, 1], "x": 1, "y": 0.2},
                 {"matrix": [4, 2], "x": 2, "y": 0},
-                {"matrix": [4, 3], "x": 3, "y": 0},
-                {"matrix": [4, 4], "x": 4, "y": 0},
+                {"matrix": [4, 3], "x": 3, "y": 0.1},
+                {"matrix": [4, 4], "x": 4, "y": 0.15},
 
-                {"matrix": [0, 4], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0.15},
+                {"matrix": [0, 3], "x": 6, "y": 0.1},
                 {"matrix": [0, 2], "x": 7, "y": 0},
-                {"matrix": [0, 1], "x": 8, "y": 0},
-                {"matrix": [0, 0], "x": 9, "y": 0},
-
-                {"matrix": [5, 0], "x": 10, "y": 0},
-                {"matrix": [5, 1], "x": 11, "y": 0},
-                {"matrix": [5, 2], "x": 12, "y": 0},
-                {"matrix": [5, 3], "x": 13, "y": 0},
-                {"matrix": [5, 4], "x": 14, "y": 0},
-
-                {"matrix": [1, 4], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 1], "x": 18, "y": 0},
-                {"matrix": [1, 0], "x": 19, "y": 0},
-
-                {"matrix": [6, 0], "x": 20, "y": 0},
-                {"matrix": [6, 1], "x": 21, "y": 0},
-                {"matrix": [6, 2], "x": 22, "y": 0},
-                {"matrix": [6, 3], "x": 23, "y": 0},
-                {"matrix": [6, 4], "x": 24, "y": 0},
-
-                {"matrix": [2, 4], "x": 25, "y": 0},
-                {"matrix": [2, 3], "x": 26, "y": 0},
-                {"matrix": [2, 2], "x": 27, "y": 0},
-                {"matrix": [2, 1], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-
-                {"matrix": [7, 3], "x": 30, "y": 0},
-                {"matrix": [7, 4], "x": 31, "y": 0},
-
-                {"matrix": [3, 4], "x": 32, "y": 0},
-                {"matrix": [3, 3], "x": 33, "y": 0}
+                {"matrix": [0, 1], "x": 8, "y": 0.2},
+                {"matrix": [0, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [5, 0], "x": 0, "y": 1.9},
+                {"matrix": [5, 1], "x": 1, "y": 1.2},
+                {"matrix": [5, 2], "x": 2, "y": 1},
+                {"matrix": [5, 3], "x": 3, "y": 1.1},
+                {"matrix": [5, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [1, 4], "x": 5, "y": 1.15},
+                {"matrix": [1, 3], "x": 6, "y": 1.1},
+                {"matrix": [1, 2], "x": 7, "y": 1},
+                {"matrix": [1, 1], "x": 8, "y": 1.2},
+                {"matrix": [1, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [6, 0], "x": 0, "y": 2.9},
+                {"matrix": [6, 1], "x": 1, "y": 2.2},
+                {"matrix": [6, 2], "x": 2, "y": 2},
+                {"matrix": [6, 3], "x": 3, "y": 2.1},
+                {"matrix": [6, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [2, 4], "x": 5, "y": 2.15},
+                {"matrix": [2, 3], "x": 6, "y": 2.1},
+                {"matrix": [2, 2], "x": 7, "y": 2},
+                {"matrix": [2, 1], "x": 8, "y": 2.2},
+                {"matrix": [2, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [7, 3], "x": 3, "y": 3.6, "h": 2},
+                {"matrix": [7, 4], "x": 4, "y": 3.65, "h": 2},
+
+                {"matrix": [3, 4], "x": 5, "y": 3.65, "h": 2},
+                {"matrix": [3, 3], "x": 6, "y": 3.6, "h": 2}
             ]
         },
         "LAYOUT_split_3x5_3": {
@@ -261,51 +261,51 @@
         },
         "LAYOUT_thumbrow": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.9},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
                 {"matrix": [0, 2], "x": 2, "y": 0},
-                {"matrix": [0, 3], "x": 3, "y": 0},
-                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.1},
+                {"matrix": [0, 4], "x": 4, "y": 0.15},
 
-                {"matrix": [4, 4], "x": 5, "y": 0},
-                {"matrix": [4, 3], "x": 6, "y": 0},
+                {"matrix": [4, 4], "x": 5, "y": 0.15},
+                {"matrix": [4, 3], "x": 6, "y": 0.1},
                 {"matrix": [4, 2], "x": 7, "y": 0},
-                {"matrix": [4, 1], "x": 8, "y": 0},
-                {"matrix": [4, 0], "x": 9, "y": 0},
-
-                {"matrix": [1, 0], "x": 10, "y": 0},
-                {"matrix": [1, 1], "x": 11, "y": 0},
-                {"matrix": [1, 2], "x": 12, "y": 0},
-                {"matrix": [1, 3], "x": 13, "y": 0},
-                {"matrix": [1, 4], "x": 14, "y": 0},
-
-                {"matrix": [5, 4], "x": 15, "y": 0},
-                {"matrix": [5, 3], "x": 16, "y": 0},
-                {"matrix": [5, 2], "x": 17, "y": 0},
-                {"matrix": [5, 1], "x": 18, "y": 0},
-                {"matrix": [5, 0], "x": 19, "y": 0},
-
-                {"matrix": [2, 0], "x": 20, "y": 0},
-                {"matrix": [2, 1], "x": 21, "y": 0},
-                {"matrix": [2, 2], "x": 22, "y": 0},
-                {"matrix": [2, 3], "x": 23, "y": 0},
-                {"matrix": [2, 4], "x": 24, "y": 0},
-
-                {"matrix": [6, 4], "x": 25, "y": 0},
-                {"matrix": [6, 3], "x": 26, "y": 0},
-                {"matrix": [6, 2], "x": 27, "y": 0},
-                {"matrix": [6, 1], "x": 28, "y": 0},
-                {"matrix": [6, 0], "x": 29, "y": 0},
-
-                {"matrix": [3, 1], "x": 30, "y": 0},
-                {"matrix": [3, 2], "x": 31, "y": 0},
-                {"matrix": [3, 3], "x": 32, "y": 0},
-                {"matrix": [3, 4], "x": 33, "y": 0},
-
-                {"matrix": [7, 4], "x": 34, "y": 0},
-                {"matrix": [7, 3], "x": 35, "y": 0},
-                {"matrix": [7, 2], "x": 36, "y": 0},
-                {"matrix": [7, 1], "x": 37, "y": 0}
+                {"matrix": [4, 1], "x": 8, "y": 0.2},
+                {"matrix": [4, 0], "x": 9, "y": 0.9},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.9},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.1},
+                {"matrix": [1, 4], "x": 4, "y": 1.15},
+
+                {"matrix": [5, 4], "x": 5, "y": 1.15},
+                {"matrix": [5, 3], "x": 6, "y": 1.1},
+                {"matrix": [5, 2], "x": 7, "y": 1},
+                {"matrix": [5, 1], "x": 8, "y": 1.2},
+                {"matrix": [5, 0], "x": 9, "y": 1.9},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.9},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.1},
+                {"matrix": [2, 4], "x": 4, "y": 2.15},
+
+                {"matrix": [6, 4], "x": 5, "y": 2.15},
+                {"matrix": [6, 3], "x": 6, "y": 2.1},
+                {"matrix": [6, 2], "x": 7, "y": 2},
+                {"matrix": [6, 1], "x": 8, "y": 2.2},
+                {"matrix": [6, 0], "x": 9, "y": 2.9},
+
+                {"matrix": [3, 1], "x": 3, "y": 4.6},
+                {"matrix": [3, 2], "x": 4, "y": 4.65},
+                {"matrix": [3, 3], "x": 3, "y": 3.6},
+                {"matrix": [3, 4], "x": 4, "y": 3.65},
+
+                {"matrix": [7, 4], "x": 5, "y": 3.65},
+                {"matrix": [7, 3], "x": 6, "y": 3.6},
+                {"matrix": [7, 2], "x": 5, "y": 4.65},
+                {"matrix": [7, 1], "x": 6, "y": 4.6}
             ]
         }
     }

keyboards/illusion/rosa/info.json

@@ -19,7 +19,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "community_layouts": ["60_ansi_tsangan"],
+    "community_layouts": ["60_ansi_tsangan", "60_tsangan_hhkb"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_tsangan_hhkb",
+        "LAYOUT_60_ansi_tsangan_split_bs_rshift": "LAYOUT_60_tsangan_hhkb"
+    },
     "layouts": {
         "LAYOUT_60_ansi_tsangan": {
             "layout": [
@@ -158,7 +162,7 @@
                 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
         },
-        "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
@@ -227,72 +231,6 @@
                 {"matrix": [4, 11], "x": 12.5, "y": 4},
                 {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
             ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [2, 13], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [3, 0], "x": 42, "y": 0},
-                {"matrix": [3, 1], "x": 43, "y": 0},
-                {"matrix": [3, 2], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 12], "x": 53, "y": 0},
-                {"matrix": [3, 13], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 6], "x": 58, "y": 0},
-                {"matrix": [4, 10], "x": 59, "y": 0},
-                {"matrix": [4, 11], "x": 60, "y": 0},
-                {"matrix": [4, 13], "x": 61, "y": 0}
-            ]
         }
     }
 }

keyboards/j80/info.json

@@ -27,99 +27,107 @@
     "LAYOUT_all": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 2], "x": 1, "y": 0},
-        {"matrix": [0, 3], "x": 2, "y": 0},
-        {"matrix": [0, 4], "x": 3, "y": 0},
-        {"matrix": [0, 5], "x": 4, "y": 0},
-        {"matrix": [0, 7], "x": 5, "y": 0},
-        {"matrix": [0, 8], "x": 6, "y": 0},
-        {"matrix": [0, 9], "x": 7, "y": 0},
-        {"matrix": [0, 10], "x": 8, "y": 0},
-        {"matrix": [0, 11], "x": 9, "y": 0},
-        {"matrix": [0, 13], "x": 10, "y": 0},
-        {"matrix": [0, 12], "x": 11, "y": 0},
-        {"matrix": [0, 1], "x": 12, "y": 0},
-        {"matrix": [6, 1], "x": 13, "y": 0},
-        {"matrix": [6, 2], "x": 14, "y": 0},
-        {"matrix": [6, 13], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 16, "y": 0},
-        {"matrix": [1, 1], "x": 17, "y": 0},
-        {"matrix": [1, 2], "x": 18, "y": 0},
-        {"matrix": [1, 3], "x": 19, "y": 0},
-        {"matrix": [1, 4], "x": 20, "y": 0},
-        {"matrix": [1, 5], "x": 21, "y": 0},
-        {"matrix": [1, 6], "x": 22, "y": 0},
-        {"matrix": [1, 7], "x": 23, "y": 0},
-        {"matrix": [1, 8], "x": 24, "y": 0},
-        {"matrix": [1, 9], "x": 25, "y": 0},
-        {"matrix": [1, 10], "x": 26, "y": 0},
-        {"matrix": [1, 11], "x": 27, "y": 0},
-        {"matrix": [1, 13], "x": 28, "y": 0},
-        {"matrix": [1, 12], "x": 29, "y": 0},
-        {"matrix": [6, 6], "x": 30, "y": 0},
-        {"matrix": [6, 5], "x": 31, "y": 0},
-        {"matrix": [6, 4], "x": 32, "y": 0},
-
-        {"matrix": [2, 0], "x": 33, "y": 0},
-        {"matrix": [2, 1], "x": 34, "y": 0},
-        {"matrix": [2, 2], "x": 35, "y": 0},
-        {"matrix": [2, 3], "x": 36, "y": 0},
-        {"matrix": [2, 4], "x": 37, "y": 0},
-        {"matrix": [2, 5], "x": 38, "y": 0},
-        {"matrix": [2, 6], "x": 39, "y": 0},
-        {"matrix": [2, 7], "x": 40, "y": 0},
-        {"matrix": [2, 8], "x": 41, "y": 0},
-        {"matrix": [2, 9], "x": 42, "y": 0},
-        {"matrix": [2, 10], "x": 43, "y": 0},
-        {"matrix": [2, 11], "x": 44, "y": 0},
-        {"matrix": [2, 13], "x": 45, "y": 0},
-        {"matrix": [2, 12], "x": 46, "y": 0},
-        {"matrix": [6, 12], "x": 47, "y": 0},
-        {"matrix": [6, 8], "x": 48, "y": 0},
-        {"matrix": [6, 7], "x": 49, "y": 0},
-
-        {"matrix": [3, 0], "x": 50, "y": 0},
-        {"matrix": [3, 1], "x": 51, "y": 0},
-        {"matrix": [3, 2], "x": 52, "y": 0},
-        {"matrix": [3, 3], "x": 53, "y": 0},
-        {"matrix": [3, 4], "x": 54, "y": 0},
-        {"matrix": [3, 5], "x": 55, "y": 0},
-        {"matrix": [3, 6], "x": 56, "y": 0},
-        {"matrix": [3, 7], "x": 57, "y": 0},
-        {"matrix": [3, 8], "x": 58, "y": 0},
-        {"matrix": [3, 9], "x": 59, "y": 0},
-        {"matrix": [3, 10], "x": 60, "y": 0},
-        {"matrix": [3, 11], "x": 61, "y": 0},
-        {"matrix": [3, 13], "x": 62, "y": 0},
-
-        {"matrix": [4, 0], "x": 63, "y": 0},
-        {"matrix": [3, 12], "x": 64, "y": 0},
-        {"matrix": [4, 1], "x": 65, "y": 0},
-        {"matrix": [4, 2], "x": 66, "y": 0},
-        {"matrix": [4, 3], "x": 67, "y": 0},
-        {"matrix": [4, 4], "x": 68, "y": 0},
-        {"matrix": [4, 5], "x": 69, "y": 0},
-        {"matrix": [4, 6], "x": 70, "y": 0},
-        {"matrix": [4, 7], "x": 71, "y": 0},
-        {"matrix": [4, 8], "x": 72, "y": 0},
-        {"matrix": [4, 9], "x": 73, "y": 0},
-        {"matrix": [4, 10], "x": 74, "y": 0},
-        {"matrix": [4, 11], "x": 75, "y": 0},
-        {"matrix": [4, 13], "x": 76, "y": 0},
-        {"matrix": [4, 12], "x": 77, "y": 0},
-
-        {"matrix": [5, 0], "x": 78, "y": 0},
-        {"matrix": [5, 1], "x": 79, "y": 0},
-        {"matrix": [5, 2], "x": 80, "y": 0},
-        {"matrix": [5, 4], "x": 81, "y": 0},
-        {"matrix": [5, 8], "x": 82, "y": 0},
-        {"matrix": [5, 9], "x": 83, "y": 0},
-        {"matrix": [5, 10], "x": 84, "y": 0},
-        {"matrix": [5, 11], "x": 85, "y": 0},
-        {"matrix": [5, 13], "x": 86, "y": 0},
-        {"matrix": [5, 12], "x": 87, "y": 0},
-        {"matrix": [5, 7], "x": 88, "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, 13], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 1], "x": 14, "y": 0},
+
+        {"matrix": [6, 1], "x": 15.25, "y": 0},
+        {"matrix": [6, 2], "x": 16.25, "y": 0},
+        {"matrix": [6, 13], "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, 13], "x": 12, "y": 1.25},
+        {"matrix": [1, 12], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+        {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [6, 4], "x": 17.25, "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, 13], "x": 12.5, "y": 2.25},
+        {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+        {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+        {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+        {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+        {"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, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [3, 12], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+        {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+        {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+        {"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, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [5, 13], "x": 15.25, "y": 5.25},
+        {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+        {"matrix": [5, 7], "x": 17.25, "y": 5.25}
       ]
     },
     "LAYOUT_tkl_ansi": {

keyboards/kbdfans/tiger80/info.json

@@ -57,185 +57,213 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
-                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0},
-                {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0},
-                {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0},
-                {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0},
-                {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0},
-                {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0},
-                {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0},
-                {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0},
-                {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0},
-                {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0},
-                {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0},
-                {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0},
-                {"label": "F13", "matrix": [0, 13], "x": 14, "y": 0},
-                {"label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0},
-                {"label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0},
-                {"label": "Pause", "matrix": [3, 15], "x": 17.25, "y": 0},
-                {"label": "`~", "matrix": [1, 0], "x": 0, "y": 1.5},
-                {"label": "1!", "matrix": [1, 1], "x": 1, "y": 1.5},
-                {"label": "2@", "matrix": [1, 2], "x": 2, "y": 1.5},
-                {"label": "3#", "matrix": [1, 3], "x": 3, "y": 1.5},
-                {"label": "4$", "matrix": [1, 4], "x": 4, "y": 1.5},
-                {"label": "5%", "matrix": [1, 5], "x": 5, "y": 1.5},
-                {"label": "6^", "matrix": [1, 6], "x": 6, "y": 1.5},
-                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
-                {"label": "8*", "matrix": [1, 8], "x": 8, "y": 1.5},
-                {"label": "9(", "matrix": [1, 9], "x": 9, "y": 1.5},
-                {"label": "0)", "matrix": [1, 10], "x": 10, "y": 1.5},
-                {"label": "-_", "matrix": [1, 11], "x": 11, "y": 1.5},
-                {"label": "=+", "matrix": [1, 12], "x": 12, "y": 1.5},
-                {"label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5},
-                {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5},
-                {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5},
-                {"label": "PgUp", "matrix": [3, 14], "x": 17.25, "y": 1.5},
-                {"label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5},
-                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
-                {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5},
-                {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5},
-                {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5},
-                {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5},
-                {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
-                {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5},
-                {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5},
-                {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5},
-                {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5},
-                {"label": "[{", "matrix": [2, 11], "x": 11.5, "y": 2.5},
-                {"label": "]}", "matrix": [2, 12], "x": 12.5, "y": 2.5},
-                {"label": "\\|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5},
-                {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5},
-                {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5},
-                {"label": "PgDn", "matrix": [4, 14], "x": 17.25, "y": 2.5},
-                {"label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5},
-                {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5},
-                {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5},
-                {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5},
-                {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5},
-                {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5},
-                {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5},
-                {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5},
-                {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5},
-                {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5},
-                {"label": ";:", "matrix": [3, 10], "x": 10.75, "y": 3.5},
-                {"label": "'\"", "matrix": [3, 11], "x": 11.75, "y": 3.5},
-                {"label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.5},
-                {"label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5},
-                {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5},
-                {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5},
-                {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5},
-                {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5},
-                {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5},
-                {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5},
-                {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5},
-                {"label": ",<", "matrix": [4, 9], "x": 9.25, "y": 4.5},
-                {"label": ".>", "matrix": [4, 10], "x": 10.25, "y": 4.5},
-                {"label": "/?", "matrix": [4, 11], "x": 11.25, "y": 4.5},
-                {"label": "Shift", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.5},
-                {"label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.5},
-                {"label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.5},
-                {"label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.5},
-                {"label": "Space", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.5},
-                {"label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.5},
-                {"label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.5},
-                {"label": "Ctrl", "matrix": [5, 12], "w": 1.5, "x": 13.5, "y": 5.5},
-                {"label": "\u2190", "matrix": [5, 13], "x": 15.25, "y": 5.5},
-                {"label": "\u2193", "matrix": [5, 14], "x": 16.25, "y": 5.5},
-                {"label": "\u2192", "matrix": [5, 15], "x": 17.25, "y": 5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 15], "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": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13],"x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "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": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [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, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"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": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
             ]
         },
         "LAYOUT_tkl_f13_iso_tsangan": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
-                {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
-                {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
-                {"label": "K0F", "matrix": [0, 15], "x": 15, "y": 0},
-                {"label": "K3F", "matrix": [3, 15], "x": 16, "y": 0},
-                {"label": "K10", "matrix": [1, 0], "x": 17, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "x": 18, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "x": 19, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "x": 20, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "x": 21, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "x": 22, "y": 0},
-                {"label": "K16", "matrix": [1, 6], "x": 23, "y": 0},
-                {"label": "K17", "matrix": [1, 7], "x": 24, "y": 0},
-                {"label": "K18", "matrix": [1, 8], "x": 25, "y": 0},
-                {"label": "K19", "matrix": [1, 9], "x": 26, "y": 0},
-                {"label": "K1A", "matrix": [1, 10], "x": 27, "y": 0},
-                {"label": "K1B", "matrix": [1, 11], "x": 28, "y": 0},
-                {"label": "K1C", "matrix": [1, 12], "x": 29, "y": 0},
-                {"label": "K1D", "matrix": [1, 13], "x": 30, "y": 0},
-                {"label": "K1E", "matrix": [1, 14], "x": 31, "y": 0},
-                {"label": "K1F", "matrix": [1, 15], "x": 32, "y": 0},
-                {"label": "K3E", "matrix": [3, 14], "x": 33, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "x": 34, "y": 0},
-                {"label": "K21", "matrix": [2, 1], "x": 35, "y": 0},
-                {"label": "K22", "matrix": [2, 2], "x": 36, "y": 0},
-                {"label": "K23", "matrix": [2, 3], "x": 37, "y": 0},
-                {"label": "K24", "matrix": [2, 4], "x": 38, "y": 0},
-                {"label": "K25", "matrix": [2, 5], "x": 39, "y": 0},
-                {"label": "K26", "matrix": [2, 6], "x": 40, "y": 0},
-                {"label": "K27", "matrix": [2, 7], "x": 41, "y": 0},
-                {"label": "K28", "matrix": [2, 8], "x": 42, "y": 0},
-                {"label": "K29", "matrix": [2, 9], "x": 43, "y": 0},
-                {"label": "K2A", "matrix": [2, 10], "x": 44, "y": 0},
-                {"label": "K2B", "matrix": [2, 11], "x": 45, "y": 0},
-                {"label": "K2C", "matrix": [2, 12], "x": 46, "y": 0},
-                {"label": "K2D", "matrix": [2, 13], "x": 47, "y": 0},
-                {"label": "K2E", "matrix": [2, 14], "x": 48, "y": 0},
-                {"label": "K2F", "matrix": [2, 15], "x": 49, "y": 0},
-                {"label": "K4E", "matrix": [4, 14], "x": 50, "y": 0},
-                {"label": "K30", "matrix": [3, 0], "x": 51, "y": 0},
-                {"label": "K31", "matrix": [3, 1], "x": 52, "y": 0},
-                {"label": "K32", "matrix": [3, 2], "x": 53, "y": 0},
-                {"label": "K33", "matrix": [3, 3], "x": 54, "y": 0},
-                {"label": "K34", "matrix": [3, 4], "x": 55, "y": 0},
-                {"label": "K35", "matrix": [3, 5], "x": 56, "y": 0},
-                {"label": "K36", "matrix": [3, 6], "x": 57, "y": 0},
-                {"label": "K37", "matrix": [3, 7], "x": 58, "y": 0},
-                {"label": "K38", "matrix": [3, 8], "x": 59, "y": 0},
-                {"label": "K39", "matrix": [3, 9], "x": 60, "y": 0},
-                {"label": "K3A", "matrix": [3, 10], "x": 61, "y": 0},
-                {"label": "K3B", "matrix": [3, 11], "x": 62, "y": 0},
-                {"label": "K3D", "matrix": [3, 13], "x": 63, "y": 0},
-                {"label": "K40", "matrix": [4, 0], "x": 64, "y": 0},
-                {"label": "K41", "matrix": [4, 1], "x": 65, "y": 0},
-                {"label": "K42", "matrix": [4, 2], "x": 66, "y": 0},
-                {"label": "K43", "matrix": [4, 3], "x": 67, "y": 0},
-                {"label": "K44", "matrix": [4, 4], "x": 68, "y": 0},
-                {"label": "K45", "matrix": [4, 5], "x": 69, "y": 0},
-                {"label": "K46", "matrix": [4, 6], "x": 70, "y": 0},
-                {"label": "K47", "matrix": [4, 7], "x": 71, "y": 0},
-                {"label": "K48", "matrix": [4, 8], "x": 72, "y": 0},
-                {"label": "K49", "matrix": [4, 9], "x": 73, "y": 0},
-                {"label": "K4A", "matrix": [4, 10], "x": 74, "y": 0},
-                {"label": "K4B", "matrix": [4, 11], "x": 75, "y": 0},
-                {"label": "K4D", "matrix": [4, 13], "x": 76, "y": 0},
-                {"label": "K4F", "matrix": [4, 15], "x": 77, "y": 0},
-                {"label": "K50", "matrix": [5, 0], "x": 78, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "x": 79, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "x": 80, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "x": 81, "y": 0},
-                {"label": "K5A", "matrix": [5, 10], "x": 82, "y": 0},
-                {"label": "K5B", "matrix": [5, 11], "x": 83, "y": 0},
-                {"label": "K5C", "matrix": [5, 12], "x": 84, "y": 0},
-                {"label": "K5D", "matrix": [5, 13], "x": 85, "y": 0},
-                {"label": "K5E", "matrix": [5, 14], "x": 86, "y": 0},
-                {"label": "K5F", "matrix": [5, 15], "x": 87, "y": 0}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 15], "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": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [3, 14], "x": 17.25, "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, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [4, 14], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [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, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"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": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 5.5}
             ]
         }
     }

keyboards/keyboardio/model01/info.json

@@ -97,70 +97,81 @@
     },
     "LAYOUT_thumb_row": {
       "layout": [
-        {"matrix": [0, 7], "x": 0, "y": 0},
-        {"matrix": [0, 6], "x": 1, "y": 0},
-        {"matrix": [0, 5], "x": 2, "y": 0},
+        {"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
+        {"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
+        {"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
         {"matrix": [0, 4], "x": 3, "y": 0},
-        {"matrix": [0, 3], "x": 4, "y": 0},
-        {"matrix": [0, 2], "x": 5, "y": 0},
-        {"matrix": [4, 5], "x": 6, "y": 0},
-        {"matrix": [4, 4], "x": 7, "y": 0},
-        {"matrix": [4, 3], "x": 8, "y": 0},
-        {"matrix": [4, 2], "x": 9, "y": 0},
-        {"matrix": [4, 1], "x": 10, "y": 0},
-        {"matrix": [4, 0], "x": 11, "y": 0},
-        {"matrix": [1, 7], "x": 12, "y": 0},
-        {"matrix": [1, 6], "x": 13, "y": 0},
-        {"matrix": [1, 5], "x": 14, "y": 0},
-        {"matrix": [1, 4], "x": 15, "y": 0},
-        {"matrix": [1, 3], "x": 16, "y": 0},
-        {"matrix": [1, 2], "x": 17, "y": 0},
-        {"matrix": [0, 1], "x": 18, "y": 0},
-        {"matrix": [4, 6], "x": 19, "y": 0},
-        {"matrix": [5, 5], "x": 20, "y": 0},
-        {"matrix": [5, 4], "x": 21, "y": 0},
-        {"matrix": [5, 3], "x": 22, "y": 0},
-        {"matrix": [5, 2], "x": 23, "y": 0},
-        {"matrix": [5, 1], "x": 24, "y": 0},
-        {"matrix": [5, 0], "x": 25, "y": 0},
-        {"matrix": [2, 7], "x": 26, "y": 0},
-        {"matrix": [2, 6], "x": 27, "y": 0},
-        {"matrix": [2, 5], "x": 28, "y": 0},
-        {"matrix": [2, 4], "x": 29, "y": 0},
-        {"matrix": [2, 3], "x": 30, "y": 0},
-        {"matrix": [2, 2], "x": 31, "y": 0},
-        {"matrix": [1, 1], "x": 32, "y": 0},
-        {"matrix": [5, 6], "x": 33, "y": 0},
-        {"matrix": [6, 5], "x": 34, "y": 0},
-        {"matrix": [6, 4], "x": 35, "y": 0},
-        {"matrix": [6, 3], "x": 36, "y": 0},
-        {"matrix": [6, 2], "x": 37, "y": 0},
-        {"matrix": [6, 1], "x": 38, "y": 0},
-        {"matrix": [6, 0], "x": 39, "y": 0},
-        {"matrix": [3, 7], "x": 40, "y": 0},
-        {"matrix": [3, 6], "x": 41, "y": 0},
-        {"matrix": [3, 5], "x": 42, "y": 0},
-        {"matrix": [3, 4], "x": 43, "y": 0},
-        {"matrix": [3, 3], "x": 44, "y": 0},
-        {"matrix": [3, 2], "x": 45, "y": 0},
-        {"matrix": [2, 1], "x": 46, "y": 0},
-        {"matrix": [6, 6], "x": 47, "y": 0},
-        {"matrix": [7, 5], "x": 48, "y": 0},
-        {"matrix": [7, 4], "x": 49, "y": 0},
-        {"matrix": [7, 3], "x": 50, "y": 0},
-        {"matrix": [7, 2], "x": 51, "y": 0},
-        {"matrix": [7, 1], "x": 52, "y": 0},
-        {"matrix": [7, 0], "x": 53, "y": 0},
-        {"matrix": [0, 0], "x": 54, "y": 0},
-        {"matrix": [1, 0], "x": 55, "y": 0},
-        {"matrix": [2, 0], "x": 56, "y": 0},
-        {"matrix": [3, 0], "x": 57, "y": 0},
-        {"matrix": [7, 7], "x": 58, "y": 0},
-        {"matrix": [6, 7], "x": 59, "y": 0},
-        {"matrix": [5, 7], "x": 60, "y": 0},
-        {"matrix": [4, 7], "x": 61, "y": 0},
-        {"matrix": [3, 1], "x": 62, "y": 0},
-        {"matrix": [7, 6], "x": 63, "y": 0}
+        {"matrix": [0, 3], "x": 4, "y": 0.1},
+        {"matrix": [0, 2], "x": 5, "y": 0.3},
+
+        {"matrix": [4, 5], "x": 12.5, "y": 0.3},
+        {"matrix": [4, 4], "x": 13.5, "y": 0.1},
+        {"matrix": [4, 3], "x": 14.5, "y": 0},
+        {"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
+        {"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
+        {"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
+
+        {"matrix": [1, 7], "x": 0, "y": 1.7},
+        {"matrix": [1, 6], "x": 1, "y": 1.7},
+        {"matrix": [1, 5], "x": 2, "y": 1.2},
+        {"matrix": [1, 4], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1.1},
+        {"matrix": [1, 2], "x": 5, "y": 1.3},
+        {"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
+
+        {"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
+        {"matrix": [5, 5], "x": 12.5, "y": 1.3},
+        {"matrix": [5, 4], "x": 13.5, "y": 1.1},
+        {"matrix": [5, 3], "x": 14.5, "y": 1},
+        {"matrix": [5, 2], "x": 15.5, "y": 1.2},
+        {"matrix": [5, 1], "x": 16.5, "y": 1.7},
+        {"matrix": [5, 0], "x": 17.5, "y": 1.7},
+
+        {"matrix": [2, 7], "x": 0, "y": 2.7},
+        {"matrix": [2, 6], "x": 1, "y": 2.7},
+        {"matrix": [2, 5], "x": 2, "y": 2.2},
+        {"matrix": [2, 4], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2.1},
+        {"matrix": [2, 2], "x": 5, "y": 2.3},
+        {"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
+
+        {"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
+        {"matrix": [6, 5], "x": 12.5, "y": 2.3},
+        {"matrix": [6, 4], "x": 13.5, "y": 2.1},
+        {"matrix": [6, 3], "x": 14.5, "y": 2},
+        {"matrix": [6, 2], "x": 15.5, "y": 2.2},
+        {"matrix": [6, 1], "x": 16.5, "y": 2.7},
+        {"matrix": [6, 0], "x": 17.5, "y": 2.7},
+
+        {"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
+        {"matrix": [3, 6], "x": 1, "y": 3.7},
+        {"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
+        {"matrix": [3, 4], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3.1},
+        {"matrix": [3, 2], "x": 5, "y": 3.3},
+        {"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
+
+        {"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
+        {"matrix": [7, 5], "x": 12.5, "y": 3.3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3.1},
+        {"matrix": [7, 3], "x": 14.5, "y": 3},
+        {"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
+        {"matrix": [7, 1], "x": 16.5, "y": 3.7},
+        {"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
+
+        {"matrix": [0, 0], "x": 4.75, "y": 4.3},
+        {"matrix": [1, 0], "x": 5.75, "y": 4.5},
+        {"matrix": [2, 0], "x": 6.75, "y": 4.7},
+        {"matrix": [3, 0], "x": 7.75, "y": 5.1},
+
+        {"matrix": [7, 7], "x": 9.75, "y": 5.1},
+        {"matrix": [6, 7], "x": 10.75, "y": 4.7},
+        {"matrix": [5, 7], "x": 11.75, "y": 4.5},
+        {"matrix": [4, 7], "x": 12.75, "y": 4.3},
+
+        {"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
+
+        {"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
       ]
     }
   }

keyboards/lfkeyboards/smk65/revb/info.json

@@ -166,83 +166,6 @@
                 {"matrix": [2, 13], "x": 14, "y": 4},
                 {"matrix": [3, 13], "x": 15, "y": 4}
             ]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "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, 15], "x": 14, "y": 0},
-
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
-                {"matrix": [1, 15], "x": 29, "y": 0},
-
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 14], "x": 42, "y": 0},
-                {"matrix": [2, 15], "x": 43, "y": 0},
-
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 1], "x": 45, "y": 0},
-                {"matrix": [3, 2], "x": 46, "y": 0},
-                {"matrix": [3, 3], "x": 47, "y": 0},
-                {"matrix": [3, 4], "x": 48, "y": 0},
-                {"matrix": [3, 5], "x": 49, "y": 0},
-                {"matrix": [3, 6], "x": 50, "y": 0},
-                {"matrix": [3, 7], "x": 51, "y": 0},
-                {"matrix": [3, 8], "x": 52, "y": 0},
-                {"matrix": [3, 9], "x": 53, "y": 0},
-                {"matrix": [3, 10], "x": 54, "y": 0},
-                {"matrix": [3, 11], "x": 55, "y": 0},
-                {"matrix": [3, 12], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
-                {"matrix": [3, 15], "x": 58, "y": 0},
-
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [2, 13], "x": 67, "y": 0},
-                {"matrix": [3, 13], "x": 68, "y": 0}
-            ]
         }
     }
 }

keyboards/lfkeyboards/smk65/revf/info.json

@@ -177,66 +177,66 @@
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [1, 6], "x": 22, "y": 0},
-                {"matrix": [1, 7], "x": 23, "y": 0},
-                {"matrix": [1, 8], "x": 24, "y": 0},
-                {"matrix": [1, 9], "x": 25, "y": 0},
-                {"matrix": [1, 10], "x": 26, "y": 0},
-                {"matrix": [1, 11], "x": 27, "y": 0},
-                {"matrix": [1, 12], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 1], "x": 32, "y": 0},
-                {"matrix": [2, 2], "x": 33, "y": 0},
-                {"matrix": [2, 3], "x": 34, "y": 0},
-                {"matrix": [2, 4], "x": 35, "y": 0},
-                {"matrix": [2, 5], "x": 36, "y": 0},
-                {"matrix": [2, 6], "x": 37, "y": 0},
-                {"matrix": [2, 7], "x": 38, "y": 0},
-                {"matrix": [2, 8], "x": 39, "y": 0},
-                {"matrix": [2, 9], "x": 40, "y": 0},
-                {"matrix": [2, 10], "x": 41, "y": 0},
-                {"matrix": [2, 11], "x": 42, "y": 0},
-                {"matrix": [2, 12], "x": 43, "y": 0},
-                {"matrix": [2, 14], "x": 44, "y": 0},
-                {"matrix": [2, 15], "x": 45, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 46, "y": 0},
-                {"matrix": [3, 1], "x": 47, "y": 0},
-                {"matrix": [3, 2], "x": 48, "y": 0},
-                {"matrix": [3, 3], "x": 49, "y": 0},
-                {"matrix": [3, 4], "x": 50, "y": 0},
-                {"matrix": [3, 5], "x": 51, "y": 0},
-                {"matrix": [3, 6], "x": 52, "y": 0},
-                {"matrix": [3, 7], "x": 53, "y": 0},
-                {"matrix": [3, 8], "x": 54, "y": 0},
-                {"matrix": [3, 9], "x": 55, "y": 0},
-                {"matrix": [3, 10], "x": 56, "y": 0},
-                {"matrix": [3, 11], "x": 57, "y": 0},
-                {"matrix": [3, 12], "x": 58, "y": 0},
-                {"matrix": [3, 14], "x": 59, "y": 0},
-                {"matrix": [3, 15], "x": 60, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 61, "y": 0},
-                {"matrix": [4, 1], "x": 62, "y": 0},
-                {"matrix": [4, 2], "x": 63, "y": 0},
-                {"matrix": [4, 4], "x": 64, "y": 0},
-                {"matrix": [4, 6], "x": 65, "y": 0},
-                {"matrix": [4, 8], "x": 66, "y": 0},
-                {"matrix": [4, 10], "x": 67, "y": 0},
-                {"matrix": [4, 11], "x": 68, "y": 0},
-                {"matrix": [4, 12], "x": 69, "y": 0},
-                {"matrix": [4, 13], "x": 70, "y": 0},
-                {"matrix": [2, 13], "x": 71, "y": 0},
-                {"matrix": [3, 13], "x": 72, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [2, 13], "x": 14, "y": 4},
+                {"matrix": [3, 13], "x": 15, "y": 4}
             ]
         }
     }

keyboards/marksard/treadstone48/rev1/info.json

@@ -84,201 +84,203 @@
         },
         "LAYOUT_full": {
             "layout": [
-                {"matrix": [4, 5], "x": 0, "y": 0},
-                {"matrix": [4, 4], "x": 1, "y": 0},
-                {"matrix": [4, 3], "x": 2, "y": 0},
-                {"matrix": [4, 2], "x": 3, "y": 0},
-                {"matrix": [4, 1], "x": 4, "y": 0},
-                {"matrix": [4, 0], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [0, 3], "x": 8, "y": 0},
-                {"matrix": [0, 2], "x": 9, "y": 0},
-                {"matrix": [0, 1], "x": 10, "y": 0},
-                {"matrix": [0, 0], "x": 11, "y": 0},
-
-                {"matrix": [12, 5], "x": 12, "y": 0},
-                {"matrix": [12, 4], "x": 13, "y": 0},
-                {"matrix": [12, 3], "x": 14, "y": 0},
-                {"matrix": [12, 2], "x": 15, "y": 0},
-                {"matrix": [12, 1], "x": 16, "y": 0},
-                {"matrix": [12, 0], "x": 17, "y": 0},
-
-                {"matrix": [8, 5], "x": 18, "y": 0},
-                {"matrix": [8, 4], "x": 19, "y": 0},
-                {"matrix": [8, 3], "x": 20, "y": 0},
-                {"matrix": [8, 2], "x": 21, "y": 0},
-                {"matrix": [8, 1], "x": 22, "y": 0},
-                {"matrix": [8, 0], "x": 23, "y": 0},
-
-                {"matrix": [5, 5], "x": 24, "y": 0},
-                {"matrix": [5, 4], "x": 25, "y": 0},
-                {"matrix": [5, 3], "x": 26, "y": 0},
-                {"matrix": [5, 2], "x": 27, "y": 0},
-                {"matrix": [5, 1], "x": 28, "y": 0},
-                {"matrix": [5, 0], "x": 29, "y": 0},
-
-                {"matrix": [1, 5], "x": 30, "y": 0},
-                {"matrix": [1, 4], "x": 31, "y": 0},
-                {"matrix": [1, 3], "x": 32, "y": 0},
-                {"matrix": [1, 2], "x": 33, "y": 0},
-                {"matrix": [1, 1], "x": 34, "y": 0},
-                {"matrix": [1, 0], "x": 35, "y": 0},
-
-                {"matrix": [13, 5], "x": 36, "y": 0},
-                {"matrix": [13, 4], "x": 37, "y": 0},
-                {"matrix": [13, 3], "x": 38, "y": 0},
-                {"matrix": [13, 2], "x": 39, "y": 0},
-                {"matrix": [13, 1], "x": 40, "y": 0},
-                {"matrix": [13, 0], "x": 41, "y": 0},
-
-                {"matrix": [9, 5], "x": 42, "y": 0},
-                {"matrix": [9, 4], "x": 43, "y": 0},
-                {"matrix": [9, 3], "x": 44, "y": 0},
-                {"matrix": [9, 2], "x": 45, "y": 0},
-                {"matrix": [9, 1], "x": 46, "y": 0},
-                {"matrix": [9, 0], "x": 47, "y": 0},
-
-                {"matrix": [6, 5], "x": 48, "y": 0},
-                {"matrix": [6, 4], "x": 49, "y": 0},
-                {"matrix": [6, 3], "x": 50, "y": 0},
-                {"matrix": [6, 2], "x": 51, "y": 0},
-                {"matrix": [6, 1], "x": 52, "y": 0},
-                {"matrix": [6, 0], "x": 53, "y": 0},
-
-                {"matrix": [2, 5], "x": 54, "y": 0},
-                {"matrix": [2, 4], "x": 55, "y": 0},
-                {"matrix": [2, 3], "x": 56, "y": 0},
-                {"matrix": [2, 2], "x": 57, "y": 0},
-                {"matrix": [2, 1], "x": 58, "y": 0},
-                {"matrix": [2, 0], "x": 59, "y": 0},
-
-                {"matrix": [14, 5], "x": 60, "y": 0},
-                {"matrix": [14, 4], "x": 61, "y": 0},
-                {"matrix": [14, 3], "x": 62, "y": 0},
-                {"matrix": [14, 2], "x": 63, "y": 0},
-                {"matrix": [14, 1], "x": 64, "y": 0},
-                {"matrix": [14, 0], "x": 65, "y": 0},
-
-                {"matrix": [10, 5], "x": 66, "y": 0},
-                {"matrix": [10, 4], "x": 67, "y": 0},
-                {"matrix": [10, 3], "x": 68, "y": 0},
-                {"matrix": [10, 2], "x": 69, "y": 0},
-                {"matrix": [10, 1], "x": 70, "y": 0},
-                {"matrix": [10, 0], "x": 71, "y": 0},
-
-                {"matrix": [7, 5], "x": 72, "y": 0},
-                {"matrix": [7, 4], "x": 73, "y": 0},
-                {"matrix": [7, 3], "x": 74, "y": 0},
-                {"matrix": [7, 2], "x": 75, "y": 0},
-                {"matrix": [7, 1], "x": 76, "y": 0},
-                {"matrix": [7, 0], "x": 77, "y": 0},
-
-                {"matrix": [3, 5], "x": 78, "y": 0},
-                {"matrix": [3, 4], "x": 79, "y": 0},
-                {"matrix": [3, 3], "x": 80, "y": 0},
-                {"matrix": [3, 2], "x": 81, "y": 0},
-                {"matrix": [3, 1], "x": 82, "y": 0},
-                {"matrix": [3, 0], "x": 83, "y": 0},
-
-                {"matrix": [15, 5], "x": 84, "y": 0},
-                {"matrix": [15, 4], "x": 85, "y": 0},
-                {"matrix": [15, 3], "x": 86, "y": 0},
-                {"matrix": [15, 2], "x": 87, "y": 0},
-                {"matrix": [15, 1], "x": 88, "y": 0},
-                {"matrix": [15, 0], "x": 89, "y": 0},
-
-                {"matrix": [11, 5], "x": 90, "y": 0},
-                {"matrix": [11, 4], "x": 91, "y": 0},
-                {"matrix": [11, 3], "x": 92, "y": 0},
-                {"matrix": [11, 2], "x": 93, "y": 0},
-                {"matrix": [11, 1], "x": 94, "y": 0},
-                {"matrix": [11, 0], "x": 95, "y": 0}
+                {"matrix": [4, 5], "x": 1, "y": 0},
+                {"matrix": [4, 4], "x": 2.25, "y": 0},
+                {"matrix": [4, 3], "x": 3.25, "y": 0},
+                {"matrix": [4, 2], "x": 4.25, "y": 0},
+                {"matrix": [4, 1], "x": 5.25, "y": 0},
+                {"matrix": [4, 0], "x": 6.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+                {"matrix": [0, 3], "x": 9.75, "y": 0},
+                {"matrix": [0, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 1], "x": 11.75, "y": 0},
+                {"matrix": [0, 0], "x": 13.75, "y": 0},
+
+                {"matrix": [12, 5], "x": 16.75, "y": 0},
+                {"matrix": [12, 4], "x": 18, "y": 0},
+                {"matrix": [12, 3], "x": 19, "y": 0},
+                {"matrix": [12, 2], "x": 20, "y": 0},
+                {"matrix": [12, 1], "x": 21, "y": 0},
+                {"matrix": [12, 0], "x": 22, "y": 0},
+
+                {"matrix": [8, 5], "x": 23.5, "y": 0},
+                {"matrix": [8, 4], "x": 24.5, "y": 0},
+                {"matrix": [8, 3], "x": 25.5, "y": 0},
+                {"matrix": [8, 2], "x": 26.5, "y": 0},
+                {"matrix": [8, 1], "x": 27.5, "y": 0},
+                {"matrix": [8, 0], "x": 29.5, "y": 0},
+
+                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 3], "x": 9.5, "y": 1},
+                {"matrix": [1, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+                {"matrix": [13, 5], "x": 16.75, "y": 1, "w": 1.5},
+                {"matrix": [13, 4], "x": 18.25, "y": 1},
+                {"matrix": [13, 3], "x": 19.25, "y": 1},
+                {"matrix": [13, 2], "x": 20.25, "y": 1},
+                {"matrix": [13, 1], "x": 21.25, "y": 1},
+                {"matrix": [13, 0], "x": 22.25, "y": 1},
+
+                {"matrix": [9, 5], "x": 23.25, "y": 1},
+                {"matrix": [9, 4], "x": 24.25, "y": 1},
+                {"matrix": [9, 3], "x": 25.25, "y": 1},
+                {"matrix": [9, 2], "x": 26.25, "y": 1},
+                {"matrix": [9, 1], "x": 27.25, "y": 1},
+                {"matrix": [9, 0], "x": 28.25, "y": 1, "w": 2.25},
+
+                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 2},
+                {"matrix": [6, 3], "x": 3.25, "y": 2},
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [6, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 0], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [2, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [2, 1], "x": 11.75, "y": 2},
+                {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+                {"matrix": [14, 5], "x": 15.75, "y": 2, "w": 2.25},
+                {"matrix": [14, 4], "x": 18, "y": 2},
+                {"matrix": [14, 3], "x": 19, "y": 2},
+                {"matrix": [14, 2], "x": 20, "y": 2},
+                {"matrix": [14, 1], "x": 21, "y": 2},
+                {"matrix": [14, 0], "x": 22, "y": 2},
+
+                {"matrix": [10, 5], "x": 23.5, "y": 2},
+                {"matrix": [10, 4], "x": 24.5, "y": 2},
+                {"matrix": [10, 3], "x": 25.5, "y": 2},
+                {"matrix": [10, 2], "x": 26.5, "y": 2},
+                {"matrix": [10, 1], "x": 27.5, "y": 2},
+                {"matrix": [10, 0], "x": 28.5, "y": 2},
+
+                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+
+                {"matrix": [3, 5], "x": 9.5, "y": 3},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 11.75, "y": 3},
+                {"matrix": [3, 2], "x": 12.75, "y": 3},
+                {"matrix": [3, 1], "x": 13.75, "y": 3},
+
+                {"matrix": [3, 0], "x": 12.75, "y": 0},
+
+                {"matrix": [15, 5], "x": 16.5, "y": 3, "w": 1.25},
+                {"matrix": [15, 4], "x": 17.75, "y": 3, "w": 1.25},
+                {"matrix": [15, 3], "x": 19, "y": 3, "w": 1.25},
+                {"matrix": [15, 2], "x": 20.25, "y": 3},
+                {"matrix": [15, 1], "x": 21.25, "y": 3, "w": 2},
+                {"matrix": [15, 0], "x": 23.25, "y": 3, "w": 2},
+
+                {"matrix": [11, 5], "x": 25.25, "y": 3},
+                {"matrix": [11, 4], "x": 26.25, "y": 3, "w": 1.25},
+                {"matrix": [11, 3], "x": 27.5, "y": 3},
+                {"matrix": [11, 2], "x": 28.5, "y": 3},
+                {"matrix": [11, 1], "x": 29.5, "y": 3},
+
+                {"matrix": [11, 0], "x": 28.5, "y": 0}
             ]
         },
         "LAYOUT_rs": {
             "layout": [
-                {"matrix": [4, 5], "x": 0, "y": 0},
-                {"matrix": [4, 4], "x": 1, "y": 0},
-                {"matrix": [4, 3], "x": 2, "y": 0},
-                {"matrix": [4, 2], "x": 3, "y": 0},
-                {"matrix": [4, 1], "x": 4, "y": 0},
-                {"matrix": [4, 0], "x": 5, "y": 0},
-
-                {"matrix": [0, 5], "x": 6, "y": 0},
-                {"matrix": [0, 4], "x": 7, "y": 0},
-                {"matrix": [0, 3], "x": 8, "y": 0},
-                {"matrix": [0, 2], "x": 9, "y": 0},
-                {"matrix": [0, 1], "x": 10, "y": 0},
-                {"matrix": [0, 0], "x": 11, "y": 0},
-
-                {"matrix": [8, 0], "x": 12, "y": 0},
-                {"matrix": [8, 1], "x": 13, "y": 0},
-                {"matrix": [8, 2], "x": 14, "y": 0},
-                {"matrix": [8, 3], "x": 15, "y": 0},
-                {"matrix": [8, 4], "x": 16, "y": 0},
-
-                {"matrix": [5, 5], "x": 17, "y": 0},
-                {"matrix": [5, 4], "x": 18, "y": 0},
-                {"matrix": [5, 3], "x": 19, "y": 0},
-                {"matrix": [5, 2], "x": 20, "y": 0},
-                {"matrix": [5, 1], "x": 21, "y": 0},
-                {"matrix": [5, 0], "x": 22, "y": 0},
-
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 4], "x": 24, "y": 0},
-                {"matrix": [1, 3], "x": 25, "y": 0},
-                {"matrix": [1, 2], "x": 26, "y": 0},
-                {"matrix": [1, 1], "x": 27, "y": 0},
-                {"matrix": [1, 0], "x": 28, "y": 0},
-
-                {"matrix": [9, 0], "x": 29, "y": 0},
-                {"matrix": [9, 1], "x": 30, "y": 0},
-                {"matrix": [9, 2], "x": 31, "y": 0},
-                {"matrix": [9, 3], "x": 32, "y": 0},
-                {"matrix": [9, 4], "x": 33, "y": 0},
-
-                {"matrix": [6, 5], "x": 34, "y": 0},
-                {"matrix": [6, 4], "x": 35, "y": 0},
-                {"matrix": [6, 3], "x": 36, "y": 0},
-                {"matrix": [6, 2], "x": 37, "y": 0},
-                {"matrix": [6, 1], "x": 38, "y": 0},
-                {"matrix": [6, 0], "x": 39, "y": 0},
-
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 4], "x": 41, "y": 0},
-                {"matrix": [2, 3], "x": 42, "y": 0},
-                {"matrix": [2, 2], "x": 43, "y": 0},
-                {"matrix": [2, 1], "x": 44, "y": 0},
-                {"matrix": [2, 0], "x": 45, "y": 0},
-
-                {"matrix": [10, 0], "x": 46, "y": 0},
-                {"matrix": [10, 1], "x": 47, "y": 0},
-                {"matrix": [10, 2], "x": 48, "y": 0},
-                {"matrix": [10, 3], "x": 49, "y": 0},
-                {"matrix": [10, 4], "x": 50, "y": 0},
-
-                {"matrix": [7, 5], "x": 51, "y": 0},
-                {"matrix": [7, 4], "x": 52, "y": 0},
-                {"matrix": [7, 3], "x": 53, "y": 0},
-                {"matrix": [7, 2], "x": 54, "y": 0},
-                {"matrix": [7, 1], "x": 55, "y": 0},
-                {"matrix": [7, 0], "x": 56, "y": 0},
-
-                {"matrix": [3, 5], "x": 57, "y": 0},
-                {"matrix": [3, 4], "x": 58, "y": 0},
-                {"matrix": [3, 3], "x": 59, "y": 0},
-                {"matrix": [3, 2], "x": 60, "y": 0},
-                {"matrix": [3, 1], "x": 61, "y": 0},
-
-                {"matrix": [11, 0], "x": 62, "y": 0},
-                {"matrix": [11, 1], "x": 63, "y": 0},
-                {"matrix": [11, 2], "x": 64, "y": 0},
-                {"matrix": [11, 3], "x": 65, "y": 0},
-                {"matrix": [11, 4], "x": 66, "y": 0},
-
-                {"matrix": [3, 0], "x": 67, "y": 0}
+                {"matrix": [4, 5], "x": 1, "y": 0},
+                {"matrix": [4, 4], "x": 2.25, "y": 0},
+                {"matrix": [4, 3], "x": 3.25, "y": 0},
+                {"matrix": [4, 2], "x": 4.25, "y": 0},
+                {"matrix": [4, 1], "x": 5.25, "y": 0},
+                {"matrix": [4, 0], "x": 6.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+                {"matrix": [0, 3], "x": 9.75, "y": 0},
+                {"matrix": [0, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 1], "x": 11.75, "y": 0},
+                {"matrix": [0, 0], "x": 13.75, "y": 0},
+
+                {"matrix": [8, 0], "x": 15.75, "y": 0},
+                {"matrix": [8, 1], "x": 16.75, "y": 0},
+                {"matrix": [8, 2], "x": 17.75, "y": 0},
+                {"matrix": [8, 3], "x": 18.75, "y": 0},
+                {"matrix": [8, 4], "x": 19.75, "y": 0},
+
+                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 3], "x": 9.5, "y": 1},
+                {"matrix": [1, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 15.75, "y": 1},
+                {"matrix": [9, 1], "x": 16.75, "y": 1},
+                {"matrix": [9, 2], "x": 17.75, "y": 1},
+                {"matrix": [9, 3], "x": 18.75, "y": 1},
+                {"matrix": [9, 4], "x": 19.75, "y": 1},
+
+                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 2},
+                {"matrix": [6, 3], "x": 3.25, "y": 2},
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [6, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 0], "x": 6.25, "y": 2},
+
+                {"matrix": [2, 5], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [2, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [2, 1], "x": 11.75, "y": 2},
+                {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+                {"matrix": [10, 0], "x": 15.75, "y": 2},
+                {"matrix": [10, 1], "x": 16.75, "y": 2},
+                {"matrix": [10, 2], "x": 17.75, "y": 2},
+                {"matrix": [10, 3], "x": 18.75, "y": 2},
+                {"matrix": [10, 4], "x": 19.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+
+                {"matrix": [3, 5], "x": 9.5, "y": 3},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 11.75, "y": 3},
+                {"matrix": [3, 2], "x": 12.75, "y": 3},
+                {"matrix": [3, 1], "x": 13.75, "y": 3},
+
+                {"matrix": [11, 0], "x": 15.75, "y": 3},
+                {"matrix": [11, 1], "x": 16.75, "y": 3},
+                {"matrix": [11, 2], "x": 17.75, "y": 3},
+                {"matrix": [11, 3], "x": 18.75, "y": 3},
+                {"matrix": [11, 4], "x": 19.75, "y": 3},
+
+                {"matrix": [3, 0], "x": 12.75, "y": 0}
             ]
         }
     }

keyboards/matrix/m12og/rev2/info.json

@@ -22,100 +22,108 @@
     "LAYOUT_all": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "y": 0},
-        {"matrix": [0, 11], "x": 11, "y": 0},
-        {"matrix": [0, 12], "x": 12, "y": 0},
-        {"matrix": [5, 0], "x": 13, "y": 0},
-        {"matrix": [5, 1], "x": 14, "y": 0},
-        {"matrix": [5, 2], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 16, "y": 0},
-        {"matrix": [1, 1], "x": 17, "y": 0},
-        {"matrix": [1, 2], "x": 18, "y": 0},
-        {"matrix": [1, 3], "x": 19, "y": 0},
-        {"matrix": [1, 4], "x": 20, "y": 0},
-        {"matrix": [1, 5], "x": 21, "y": 0},
-        {"matrix": [1, 6], "x": 22, "y": 0},
-        {"matrix": [1, 7], "x": 23, "y": 0},
-        {"matrix": [1, 8], "x": 24, "y": 0},
-        {"matrix": [1, 9], "x": 25, "y": 0},
-        {"matrix": [1, 10], "x": 26, "y": 0},
-        {"matrix": [1, 11], "x": 27, "y": 0},
-        {"matrix": [1, 12], "x": 28, "y": 0},
-        {"matrix": [1, 13], "x": 29, "y": 0},
-        {"matrix": [0, 13], "x": 30, "y": 0},
-        {"matrix": [5, 3], "x": 31, "y": 0},
-        {"matrix": [5, 4], "x": 32, "y": 0},
-        {"matrix": [5, 5], "x": 33, "y": 0},
-
-        {"matrix": [2, 0], "x": 34, "y": 0},
-        {"matrix": [2, 1], "x": 35, "y": 0},
-        {"matrix": [2, 2], "x": 36, "y": 0},
-        {"matrix": [2, 3], "x": 37, "y": 0},
-        {"matrix": [2, 4], "x": 38, "y": 0},
-        {"matrix": [2, 5], "x": 39, "y": 0},
-        {"matrix": [2, 6], "x": 40, "y": 0},
-        {"matrix": [2, 7], "x": 41, "y": 0},
-        {"matrix": [2, 8], "x": 42, "y": 0},
-        {"matrix": [2, 9], "x": 43, "y": 0},
-        {"matrix": [2, 10], "x": 44, "y": 0},
-        {"matrix": [2, 11], "x": 45, "y": 0},
-        {"matrix": [2, 12], "x": 46, "y": 0},
-        {"matrix": [2, 13], "x": 47, "y": 0},
-        {"matrix": [5, 6], "x": 48, "y": 0},
-        {"matrix": [5, 7], "x": 49, "y": 0},
-        {"matrix": [5, 8], "x": 50, "y": 0},
-
-        {"matrix": [3, 0], "x": 51, "y": 0},
-        {"matrix": [3, 1], "x": 52, "y": 0},
-        {"matrix": [3, 2], "x": 53, "y": 0},
-        {"matrix": [3, 3], "x": 54, "y": 0},
-        {"matrix": [3, 4], "x": 55, "y": 0},
-        {"matrix": [3, 5], "x": 56, "y": 0},
-        {"matrix": [3, 6], "x": 57, "y": 0},
-        {"matrix": [3, 7], "x": 58, "y": 0},
-        {"matrix": [3, 8], "x": 59, "y": 0},
-        {"matrix": [3, 9], "x": 60, "y": 0},
-        {"matrix": [3, 10], "x": 61, "y": 0},
-        {"matrix": [3, 11], "x": 62, "y": 0},
-        {"matrix": [3, 12], "x": 63, "y": 0},
-        {"matrix": [3, 13], "x": 64, "y": 0},
-
-        {"matrix": [4, 0], "x": 65, "y": 0},
-        {"matrix": [4, 1], "x": 66, "y": 0},
-        {"matrix": [4, 2], "x": 67, "y": 0},
-        {"matrix": [4, 3], "x": 68, "y": 0},
-        {"matrix": [4, 4], "x": 69, "y": 0},
-        {"matrix": [4, 5], "x": 70, "y": 0},
-        {"matrix": [4, 6], "x": 71, "y": 0},
-        {"matrix": [4, 7], "x": 72, "y": 0},
-        {"matrix": [4, 8], "x": 73, "y": 0},
-        {"matrix": [4, 9], "x": 74, "y": 0},
-        {"matrix": [4, 10], "x": 75, "y": 0},
-        {"matrix": [4, 11], "x": 76, "y": 0},
-        {"matrix": [4, 12], "x": 77, "y": 0},
-        {"matrix": [4, 13], "x": 78, "y": 0},
-        {"matrix": [6, 10], "x": 79, "y": 0},
-
-        {"matrix": [6, 0], "x": 80, "y": 0},
-        {"matrix": [6, 1], "x": 81, "y": 0},
-        {"matrix": [6, 2], "x": 82, "y": 0},
-        {"matrix": [6, 3], "x": 83, "y": 0},
-        {"matrix": [6, 4], "x": 84, "y": 0},
-        {"matrix": [6, 5], "x": 85, "y": 0},
-        {"matrix": [6, 6], "x": 86, "y": 0},
-        {"matrix": [6, 7], "x": 87, "y": 0},
-        {"matrix": [6, 8], "x": 88, "y": 0},
-        {"matrix": [6, 9], "x": 89, "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": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [5, 0], "x": 15.25, "y": 0},
+        {"matrix": [5, 1], "x": 16.25, "y": 0},
+        {"matrix": [5, 2], "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": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5},
+        {"matrix": [0, 13], "x": 14, "y": 1.5},
+
+        {"matrix": [5, 3], "x": 15.25, "y": 1.5},
+        {"matrix": [5, 4], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 5], "x": 17.25, "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": [5, 6], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 7], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [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": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+        {"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, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+        {"matrix": [4, 13], "x": 14, "y": 4.5},
+
+        {"matrix": [6, 10], "x": 16.25, "y": 4.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 1], "x": 1.5, "y": 5.5},
+        {"matrix": [6, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 3], "x": 4, "y": 5.5, "w": 7},
+        {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+        {"matrix": [6, 5], "x": 12.5, "y": 5.5},
+        {"matrix": [6, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+        {"matrix": [6, 7], "x": 15.25, "y": 5.5},
+        {"matrix": [6, 8], "x": 16.25, "y": 5.5},
+        {"matrix": [6, 9], "x": 17.25, "y": 5.5}
       ]
     },
     "LAYOUT_tkl_ansi": {

keyboards/matrix/me/info.json

@@ -26,99 +26,107 @@
     "LAYOUT_all": {
       "layout": [
         {"matrix": [0, 0], "x": 0, "y": 0},
-        {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-        {"matrix": [0, 7], "x": 7, "y": 0},
-        {"matrix": [0, 8], "x": 8, "y": 0},
-        {"matrix": [0, 9], "x": 9, "y": 0},
-        {"matrix": [0, 10], "x": 10, "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": [1, 14], "x": 15, "y": 0},
-
-        {"matrix": [1, 0], "x": 16, "y": 0},
-        {"matrix": [1, 1], "x": 17, "y": 0},
-        {"matrix": [1, 2], "x": 18, "y": 0},
-        {"matrix": [1, 3], "x": 19, "y": 0},
-        {"matrix": [1, 4], "x": 20, "y": 0},
-        {"matrix": [1, 5], "x": 21, "y": 0},
-        {"matrix": [1, 6], "x": 22, "y": 0},
-        {"matrix": [1, 7], "x": 23, "y": 0},
-        {"matrix": [1, 8], "x": 24, "y": 0},
-        {"matrix": [1, 9], "x": 25, "y": 0},
-        {"matrix": [1, 10], "x": 26, "y": 0},
-        {"matrix": [1, 11], "x": 27, "y": 0},
-        {"matrix": [1, 12], "x": 28, "y": 0},
-        {"matrix": [1, 13], "x": 29, "y": 0},
-        {"matrix": [2, 14], "x": 30, "y": 0},
-        {"matrix": [3, 14], "x": 31, "y": 0},
-        {"matrix": [5, 14], "x": 32, "y": 0},
-
-        {"matrix": [2, 0], "x": 33, "y": 0},
-        {"matrix": [2, 1], "x": 34, "y": 0},
-        {"matrix": [2, 2], "x": 35, "y": 0},
-        {"matrix": [2, 3], "x": 36, "y": 0},
-        {"matrix": [2, 4], "x": 37, "y": 0},
-        {"matrix": [2, 5], "x": 38, "y": 0},
-        {"matrix": [2, 6], "x": 39, "y": 0},
-        {"matrix": [2, 7], "x": 40, "y": 0},
-        {"matrix": [2, 8], "x": 41, "y": 0},
-        {"matrix": [2, 9], "x": 42, "y": 0},
-        {"matrix": [2, 10], "x": 43, "y": 0},
-        {"matrix": [2, 11], "x": 44, "y": 0},
-        {"matrix": [2, 12], "x": 45, "y": 0},
-        {"matrix": [2, 13], "x": 46, "y": 0},
-        {"matrix": [5, 13], "x": 47, "y": 0},
-        {"matrix": [5, 12], "x": 48, "y": 0},
-        {"matrix": [5, 11], "x": 49, "y": 0},
-
-        {"matrix": [3, 0], "x": 50, "y": 0},
-        {"matrix": [3, 1], "x": 51, "y": 0},
-        {"matrix": [3, 2], "x": 52, "y": 0},
-        {"matrix": [3, 3], "x": 53, "y": 0},
-        {"matrix": [3, 4], "x": 54, "y": 0},
-        {"matrix": [3, 5], "x": 55, "y": 0},
-        {"matrix": [3, 6], "x": 56, "y": 0},
-        {"matrix": [3, 7], "x": 57, "y": 0},
-        {"matrix": [3, 8], "x": 58, "y": 0},
-        {"matrix": [3, 9], "x": 59, "y": 0},
-        {"matrix": [3, 10], "x": 60, "y": 0},
-        {"matrix": [3, 11], "x": 61, "y": 0},
-        {"matrix": [3, 12], "x": 62, "y": 0},
-        {"matrix": [3, 13], "x": 63, "y": 0},
-
-        {"matrix": [4, 0], "x": 64, "y": 0},
-        {"matrix": [4, 1], "x": 65, "y": 0},
-        {"matrix": [4, 2], "x": 66, "y": 0},
-        {"matrix": [4, 3], "x": 67, "y": 0},
-        {"matrix": [4, 4], "x": 68, "y": 0},
-        {"matrix": [4, 5], "x": 69, "y": 0},
-        {"matrix": [4, 6], "x": 70, "y": 0},
-        {"matrix": [4, 7], "x": 71, "y": 0},
-        {"matrix": [4, 8], "x": 72, "y": 0},
-        {"matrix": [4, 9], "x": 73, "y": 0},
-        {"matrix": [4, 10], "x": 74, "y": 0},
-        {"matrix": [4, 11], "x": 75, "y": 0},
-        {"matrix": [4, 12], "x": 76, "y": 0},
-        {"matrix": [4, 13], "x": 77, "y": 0},
-
-        {"matrix": [5, 0], "x": 78, "y": 0},
-        {"matrix": [5, 1], "x": 79, "y": 0},
-        {"matrix": [5, 2], "x": 80, "y": 0},
-        {"matrix": [5, 3], "x": 81, "y": 0},
-        {"matrix": [5, 4], "x": 82, "y": 0},
-        {"matrix": [5, 5], "x": 83, "y": 0},
-        {"matrix": [5, 6], "x": 84, "y": 0},
-        {"matrix": [5, 7], "x": 85, "y": 0},
-        {"matrix": [5, 8], "x": 86, "y": 0},
-        {"matrix": [5, 9], "x": 87, "y": 0},
-        {"matrix": [5, 10], "x": 88, "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": [0, 11], "x": 13, "y": 0},
+        {"matrix": [0, 12], "x": 14, "y": 0},
+
+        {"matrix": [0, 13], "x": 15.25, "y": 0},
+        {"matrix": [0, 14], "x": 16.25, "y": 0},
+        {"matrix": [1, 14], "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": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [3, 14], "x": 16.25, "y": 1.5},
+        {"matrix": [5, 14], "x": 17.25, "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": [5, 13], "x": 15.25, "y": 2.5},
+        {"matrix": [5, 12], "x": 16.25, "y": 2.5},
+        {"matrix": [5, 11], "x": 17.25, "y": 2.5},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [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": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25},
+
+        {"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, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 13], "x": 16.25, "y": 4.5},
+
+        {"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, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 10], "x": 17.25, "y": 5.5}
       ]
     },
     "LAYOUT_tkl_ansi_tsangan": {

keyboards/matthewdias/m3n3van/info.json

@@ -86,39 +86,42 @@
                 {"matrix": [0, 9], "x": 9, "y": 0},
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [1, 0], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 7], "x": 20, "y": 0},
-                {"matrix": [1, 8], "x": 21, "y": 0},
-                {"matrix": [1, 9], "x": 22, "y": 0},
-                {"matrix": [1, 10], "x": 23, "y": 0},
-                {"matrix": [1, 12], "x": 24, "y": 0},
-                {"matrix": [2, 0], "x": 25, "y": 0},
-                {"matrix": [2, 2], "x": 26, "y": 0},
-                {"matrix": [2, 3], "x": 27, "y": 0},
-                {"matrix": [2, 4], "x": 28, "y": 0},
-                {"matrix": [2, 5], "x": 29, "y": 0},
-                {"matrix": [2, 6], "x": 30, "y": 0},
-                {"matrix": [2, 7], "x": 31, "y": 0},
-                {"matrix": [2, 8], "x": 32, "y": 0},
-                {"matrix": [2, 9], "x": 33, "y": 0},
-                {"matrix": [2, 10], "x": 34, "y": 0},
-                {"matrix": [2, 11], "x": 35, "y": 0},
-                {"matrix": [2, 12], "x": 36, "y": 0},
-                {"matrix": [3, 0], "x": 37, "y": 0},
-                {"matrix": [3, 1], "x": 38, "y": 0},
-                {"matrix": [3, 2], "x": 39, "y": 0},
-                {"matrix": [3, 4], "x": 40, "y": 0},
-                {"matrix": [3, 7], "x": 41, "y": 0},
-                {"matrix": [3, 9], "x": 42, "y": 0},
-                {"matrix": [3, 11], "x": 43, "y": 0},
-                {"matrix": [3, 12], "x": 44, "y": 0}
+                {"matrix": [0, 12], "x": 12, "y": 0, "w": 0.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.25}
             ]
         }
     }

keyboards/mechlovin/kanu/info.json

@@ -114,65 +114,66 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x": 13, "y": 0},
-                {"matrix": [4, 9], "x": 14, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [4, 9], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 1], "x": 45, "y": 0},
-                {"matrix": [3, 2], "x": 46, "y": 0},
-                {"matrix": [3, 3], "x": 47, "y": 0},
-                {"matrix": [3, 4], "x": 48, "y": 0},
-                {"matrix": [3, 5], "x": 49, "y": 0},
-                {"matrix": [3, 6], "x": 50, "y": 0},
-                {"matrix": [3, 7], "x": 51, "y": 0},
-                {"matrix": [3, 8], "x": 52, "y": 0},
-                {"matrix": [3, 9], "x": 53, "y": 0},
-                {"matrix": [3, 10], "x": 54, "y": 0},
-                {"matrix": [3, 11], "x": 55, "y": 0},
-                {"matrix": [3, 12], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
 
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0}
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_blocker_split_bs": {

keyboards/merge/uma/info.json

@@ -29,79 +29,96 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [5, 7], "x": 14, "y": 0},
-                {"matrix": [7, 7], "x": 15, "y": 0},
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [6, 0], "x": 22, "y": 0},
-                {"matrix": [6, 1], "x": 23, "y": 0},
-                {"matrix": [6, 2], "x": 24, "y": 0},
-                {"matrix": [6, 3], "x": 25, "y": 0},
-                {"matrix": [6, 4], "x": 26, "y": 0},
-                {"matrix": [6, 5], "x": 27, "y": 0},
-                {"matrix": [6, 6], "x": 28, "y": 0},
-                {"matrix": [6, 7], "x": 29, "y": 0},
-                {"matrix": [8, 7], "x": 30, "y": 0},
-                {"matrix": [4, 5], "x": 31, "y": 0},
-                {"matrix": [2, 0], "x": 32, "y": 0},
-                {"matrix": [2, 1], "x": 33, "y": 0},
-                {"matrix": [2, 2], "x": 34, "y": 0},
-                {"matrix": [2, 3], "x": 35, "y": 0},
-                {"matrix": [2, 4], "x": 36, "y": 0},
-                {"matrix": [2, 5], "x": 37, "y": 0},
-                {"matrix": [7, 0], "x": 38, "y": 0},
-                {"matrix": [7, 1], "x": 39, "y": 0},
-                {"matrix": [7, 2], "x": 40, "y": 0},
-                {"matrix": [7, 3], "x": 41, "y": 0},
-                {"matrix": [7, 4], "x": 42, "y": 0},
-                {"matrix": [7, 5], "x": 43, "y": 0},
-                {"matrix": [7, 6], "x": 44, "y": 0},
-                {"matrix": [9, 7], "x": 45, "y": 0},
-                {"matrix": [4, 6], "x": 46, "y": 0},
-                {"matrix": [3, 0], "x": 47, "y": 0},
-                {"matrix": [4, 1], "x": 48, "y": 0},
-                {"matrix": [3, 1], "x": 49, "y": 0},
-                {"matrix": [3, 2], "x": 50, "y": 0},
-                {"matrix": [3, 3], "x": 51, "y": 0},
-                {"matrix": [3, 4], "x": 52, "y": 0},
-                {"matrix": [3, 5], "x": 53, "y": 0},
-                {"matrix": [9, 6], "x": 54, "y": 0},
-                {"matrix": [8, 0], "x": 55, "y": 0},
-                {"matrix": [8, 1], "x": 56, "y": 0},
-                {"matrix": [8, 2], "x": 57, "y": 0},
-                {"matrix": [8, 3], "x": 58, "y": 0},
-                {"matrix": [8, 4], "x": 59, "y": 0},
-                {"matrix": [8, 5], "x": 60, "y": 0},
-                {"matrix": [8, 6], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 0], "x": 63, "y": 0},
-                {"matrix": [4, 2], "x": 64, "y": 0},
-                {"matrix": [4, 3], "x": 65, "y": 0},
-                {"matrix": [4, 4], "x": 66, "y": 0},
-                {"matrix": [9, 0], "x": 67, "y": 0},
-                {"matrix": [9, 1], "x": 68, "y": 0},
-                {"matrix": [9, 2], "x": 69, "y": 0},
-                {"matrix": [9, 3], "x": 70, "y": 0},
-                {"matrix": [9, 4], "x": 71, "y": 0},
-                {"matrix": [9, 5], "x": 72, "y": 0}
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+                {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_ansi_lspace_2u_bksp": {
@@ -473,308 +490,376 @@
         },
         "LAYOUT_iso_lspace_2u_bksp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 7], "x": 13, "y": 0},
-                {"matrix": [7, 7], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [6, 0], "x": 21, "y": 0},
-                {"matrix": [6, 1], "x": 22, "y": 0},
-                {"matrix": [6, 2], "x": 23, "y": 0},
-                {"matrix": [6, 3], "x": 24, "y": 0},
-                {"matrix": [6, 4], "x": 25, "y": 0},
-                {"matrix": [6, 5], "x": 26, "y": 0},
-                {"matrix": [6, 6], "x": 27, "y": 0},
-                {"matrix": [6, 7], "x": 28, "y": 0},
-                {"matrix": [8, 7], "x": 29, "y": 0},
-                {"matrix": [4, 5], "x": 30, "y": 0},
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 1], "x": 32, "y": 0},
-                {"matrix": [2, 2], "x": 33, "y": 0},
-                {"matrix": [2, 3], "x": 34, "y": 0},
-                {"matrix": [2, 4], "x": 35, "y": 0},
-                {"matrix": [2, 5], "x": 36, "y": 0},
-                {"matrix": [7, 0], "x": 37, "y": 0},
-                {"matrix": [7, 1], "x": 38, "y": 0},
-                {"matrix": [7, 2], "x": 39, "y": 0},
-                {"matrix": [7, 3], "x": 40, "y": 0},
-                {"matrix": [7, 4], "x": 41, "y": 0},
-                {"matrix": [7, 5], "x": 42, "y": 0},
-                {"matrix": [7, 6], "x": 43, "y": 0},
-                {"matrix": [9, 7], "x": 44, "y": 0},
-                {"matrix": [4, 6], "x": 45, "y": 0},
-                {"matrix": [3, 0], "x": 46, "y": 0},
-                {"matrix": [4, 1], "x": 47, "y": 0},
-                {"matrix": [3, 1], "x": 48, "y": 0},
-                {"matrix": [3, 2], "x": 49, "y": 0},
-                {"matrix": [3, 3], "x": 50, "y": 0},
-                {"matrix": [3, 4], "x": 51, "y": 0},
-                {"matrix": [3, 5], "x": 52, "y": 0},
-                {"matrix": [9, 6], "x": 53, "y": 0},
-                {"matrix": [8, 0], "x": 54, "y": 0},
-                {"matrix": [8, 1], "x": 55, "y": 0},
-                {"matrix": [8, 2], "x": 56, "y": 0},
-                {"matrix": [8, 3], "x": 57, "y": 0},
-                {"matrix": [8, 4], "x": 58, "y": 0},
-                {"matrix": [8, 5], "x": 59, "y": 0},
-                {"matrix": [8, 6], "x": 60, "y": 0},
-                {"matrix": [4, 7], "x": 61, "y": 0},
-                {"matrix": [4, 0], "x": 62, "y": 0},
-                {"matrix": [4, 2], "x": 63, "y": 0},
-                {"matrix": [4, 4], "x": 64, "y": 0},
-                {"matrix": [4, 3], "x": 65, "y": 0},
-                {"matrix": [9, 0], "x": 66, "y": 0},
-                {"matrix": [9, 1], "x": 67, "y": 0},
-                {"matrix": [9, 2], "x": 68, "y": 0},
-                {"matrix": [9, 3], "x": 69, "y": 0},
-                {"matrix": [9, 4], "x": 70, "y": 0},
-                {"matrix": [9, 5], "x": 71, "y": 0}
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_iso_lspace_split_bksp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [5, 7], "x": 14, "y": 0},
-                {"matrix": [7, 7], "x": 15, "y": 0},
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [6, 0], "x": 22, "y": 0},
-                {"matrix": [6, 1], "x": 23, "y": 0},
-                {"matrix": [6, 2], "x": 24, "y": 0},
-                {"matrix": [6, 3], "x": 25, "y": 0},
-                {"matrix": [6, 4], "x": 26, "y": 0},
-                {"matrix": [6, 5], "x": 27, "y": 0},
-                {"matrix": [6, 6], "x": 28, "y": 0},
-                {"matrix": [6, 7], "x": 29, "y": 0},
-                {"matrix": [8, 7], "x": 30, "y": 0},
-                {"matrix": [4, 5], "x": 31, "y": 0},
-                {"matrix": [2, 0], "x": 32, "y": 0},
-                {"matrix": [2, 1], "x": 33, "y": 0},
-                {"matrix": [2, 2], "x": 34, "y": 0},
-                {"matrix": [2, 3], "x": 35, "y": 0},
-                {"matrix": [2, 4], "x": 36, "y": 0},
-                {"matrix": [2, 5], "x": 37, "y": 0},
-                {"matrix": [7, 0], "x": 38, "y": 0},
-                {"matrix": [7, 1], "x": 39, "y": 0},
-                {"matrix": [7, 2], "x": 40, "y": 0},
-                {"matrix": [7, 3], "x": 41, "y": 0},
-                {"matrix": [7, 4], "x": 42, "y": 0},
-                {"matrix": [7, 5], "x": 43, "y": 0},
-                {"matrix": [7, 6], "x": 44, "y": 0},
-                {"matrix": [9, 7], "x": 45, "y": 0},
-                {"matrix": [4, 6], "x": 46, "y": 0},
-                {"matrix": [3, 0], "x": 47, "y": 0},
-                {"matrix": [4, 1], "x": 48, "y": 0},
-                {"matrix": [3, 1], "x": 49, "y": 0},
-                {"matrix": [3, 2], "x": 50, "y": 0},
-                {"matrix": [3, 3], "x": 51, "y": 0},
-                {"matrix": [3, 4], "x": 52, "y": 0},
-                {"matrix": [3, 5], "x": 53, "y": 0},
-                {"matrix": [9, 6], "x": 54, "y": 0},
-                {"matrix": [8, 0], "x": 55, "y": 0},
-                {"matrix": [8, 1], "x": 56, "y": 0},
-                {"matrix": [8, 2], "x": 57, "y": 0},
-                {"matrix": [8, 3], "x": 58, "y": 0},
-                {"matrix": [8, 4], "x": 59, "y": 0},
-                {"matrix": [8, 5], "x": 60, "y": 0},
-                {"matrix": [8, 6], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 0], "x": 63, "y": 0},
-                {"matrix": [4, 2], "x": 64, "y": 0},
-                {"matrix": [4, 4], "x": 65, "y": 0},
-                {"matrix": [4, 3], "x": 66, "y": 0},
-                {"matrix": [9, 0], "x": 67, "y": 0},
-                {"matrix": [9, 1], "x": 68, "y": 0},
-                {"matrix": [9, 2], "x": 69, "y": 0},
-                {"matrix": [9, 3], "x": 70, "y": 0},
-                {"matrix": [9, 4], "x": 71, "y": 0},
-                {"matrix": [9, 5], "x": 72, "y": 0}
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_iso_rspace_2u_bksp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 7], "x": 13, "y": 0},
-                {"matrix": [7, 7], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [6, 0], "x": 21, "y": 0},
-                {"matrix": [6, 1], "x": 22, "y": 0},
-                {"matrix": [6, 2], "x": 23, "y": 0},
-                {"matrix": [6, 3], "x": 24, "y": 0},
-                {"matrix": [6, 4], "x": 25, "y": 0},
-                {"matrix": [6, 5], "x": 26, "y": 0},
-                {"matrix": [6, 6], "x": 27, "y": 0},
-                {"matrix": [6, 7], "x": 28, "y": 0},
-                {"matrix": [8, 7], "x": 29, "y": 0},
-                {"matrix": [4, 5], "x": 30, "y": 0},
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 1], "x": 32, "y": 0},
-                {"matrix": [2, 2], "x": 33, "y": 0},
-                {"matrix": [2, 3], "x": 34, "y": 0},
-                {"matrix": [2, 4], "x": 35, "y": 0},
-                {"matrix": [2, 5], "x": 36, "y": 0},
-                {"matrix": [7, 0], "x": 37, "y": 0},
-                {"matrix": [7, 1], "x": 38, "y": 0},
-                {"matrix": [7, 2], "x": 39, "y": 0},
-                {"matrix": [7, 3], "x": 40, "y": 0},
-                {"matrix": [7, 4], "x": 41, "y": 0},
-                {"matrix": [7, 5], "x": 42, "y": 0},
-                {"matrix": [7, 6], "x": 43, "y": 0},
-                {"matrix": [9, 7], "x": 44, "y": 0},
-                {"matrix": [4, 6], "x": 45, "y": 0},
-                {"matrix": [3, 0], "x": 46, "y": 0},
-                {"matrix": [4, 1], "x": 47, "y": 0},
-                {"matrix": [3, 1], "x": 48, "y": 0},
-                {"matrix": [3, 2], "x": 49, "y": 0},
-                {"matrix": [3, 3], "x": 50, "y": 0},
-                {"matrix": [3, 4], "x": 51, "y": 0},
-                {"matrix": [3, 5], "x": 52, "y": 0},
-                {"matrix": [9, 6], "x": 53, "y": 0},
-                {"matrix": [8, 0], "x": 54, "y": 0},
-                {"matrix": [8, 1], "x": 55, "y": 0},
-                {"matrix": [8, 2], "x": 56, "y": 0},
-                {"matrix": [8, 3], "x": 57, "y": 0},
-                {"matrix": [8, 4], "x": 58, "y": 0},
-                {"matrix": [8, 5], "x": 59, "y": 0},
-                {"matrix": [8, 6], "x": 60, "y": 0},
-                {"matrix": [4, 7], "x": 61, "y": 0},
-                {"matrix": [4, 0], "x": 62, "y": 0},
-                {"matrix": [4, 2], "x": 63, "y": 0},
-                {"matrix": [4, 3], "x": 64, "y": 0},
-                {"matrix": [4, 4], "x": 65, "y": 0},
-                {"matrix": [9, 0], "x": 66, "y": 0},
-                {"matrix": [9, 1], "x": 67, "y": 0},
-                {"matrix": [9, 2], "x": 68, "y": 0},
-                {"matrix": [9, 3], "x": 69, "y": 0},
-                {"matrix": [9, 4], "x": 70, "y": 0},
-                {"matrix": [9, 5], "x": 71, "y": 0}
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
             ]
         },
         "LAYOUT_iso_rspace_split_bksp": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [5, 0], "x": 7, "y": 0},
-                {"matrix": [5, 1], "x": 8, "y": 0},
-                {"matrix": [5, 2], "x": 9, "y": 0},
-                {"matrix": [5, 3], "x": 10, "y": 0},
-                {"matrix": [5, 4], "x": 11, "y": 0},
-                {"matrix": [5, 5], "x": 12, "y": 0},
-                {"matrix": [5, 6], "x": 13, "y": 0},
-                {"matrix": [5, 7], "x": 14, "y": 0},
-                {"matrix": [7, 7], "x": 15, "y": 0},
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [6, 0], "x": 22, "y": 0},
-                {"matrix": [6, 1], "x": 23, "y": 0},
-                {"matrix": [6, 2], "x": 24, "y": 0},
-                {"matrix": [6, 3], "x": 25, "y": 0},
-                {"matrix": [6, 4], "x": 26, "y": 0},
-                {"matrix": [6, 5], "x": 27, "y": 0},
-                {"matrix": [6, 6], "x": 28, "y": 0},
-                {"matrix": [6, 7], "x": 29, "y": 0},
-                {"matrix": [8, 7], "x": 30, "y": 0},
-                {"matrix": [4, 5], "x": 31, "y": 0},
-                {"matrix": [2, 0], "x": 32, "y": 0},
-                {"matrix": [2, 1], "x": 33, "y": 0},
-                {"matrix": [2, 2], "x": 34, "y": 0},
-                {"matrix": [2, 3], "x": 35, "y": 0},
-                {"matrix": [2, 4], "x": 36, "y": 0},
-                {"matrix": [2, 5], "x": 37, "y": 0},
-                {"matrix": [7, 0], "x": 38, "y": 0},
-                {"matrix": [7, 1], "x": 39, "y": 0},
-                {"matrix": [7, 2], "x": 40, "y": 0},
-                {"matrix": [7, 3], "x": 41, "y": 0},
-                {"matrix": [7, 4], "x": 42, "y": 0},
-                {"matrix": [7, 5], "x": 43, "y": 0},
-                {"matrix": [7, 6], "x": 44, "y": 0},
-                {"matrix": [9, 7], "x": 45, "y": 0},
-                {"matrix": [4, 6], "x": 46, "y": 0},
-                {"matrix": [3, 0], "x": 47, "y": 0},
-                {"matrix": [4, 1], "x": 48, "y": 0},
-                {"matrix": [3, 1], "x": 49, "y": 0},
-                {"matrix": [3, 2], "x": 50, "y": 0},
-                {"matrix": [3, 3], "x": 51, "y": 0},
-                {"matrix": [3, 4], "x": 52, "y": 0},
-                {"matrix": [3, 5], "x": 53, "y": 0},
-                {"matrix": [9, 6], "x": 54, "y": 0},
-                {"matrix": [8, 0], "x": 55, "y": 0},
-                {"matrix": [8, 1], "x": 56, "y": 0},
-                {"matrix": [8, 2], "x": 57, "y": 0},
-                {"matrix": [8, 3], "x": 58, "y": 0},
-                {"matrix": [8, 4], "x": 59, "y": 0},
-                {"matrix": [8, 5], "x": 60, "y": 0},
-                {"matrix": [8, 6], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 0], "x": 63, "y": 0},
-                {"matrix": [4, 2], "x": 64, "y": 0},
-                {"matrix": [4, 3], "x": 65, "y": 0},
-                {"matrix": [4, 4], "x": 66, "y": 0},
-                {"matrix": [9, 0], "x": 67, "y": 0},
-                {"matrix": [9, 1], "x": 68, "y": 0},
-                {"matrix": [9, 2], "x": 69, "y": 0},
-                {"matrix": [9, 3], "x": 70, "y": 0},
-                {"matrix": [9, 4], "x": 71, "y": 0},
-                {"matrix": [9, 5], "x": 72, "y": 0}
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [0, 3], "x": 4.5, "y": 0},
+                {"matrix": [0, 4], "x": 5.5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+
+                {"matrix": [5, 0], "x": 10.5, "y": 0},
+                {"matrix": [5, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 2], "x": 12.5, "y": 0},
+                {"matrix": [5, 3], "x": 13.5, "y": 0},
+                {"matrix": [5, 4], "x": 14.5, "y": 0},
+                {"matrix": [5, 5], "x": 15.5, "y": 0},
+                {"matrix": [5, 6], "x": 16.5, "y": 0},
+                {"matrix": [5, 7], "x": 17.5, "y": 0},
+
+                {"matrix": [7, 7], "x": 19, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1},
+                {"matrix": [1, 4], "x": 6, "y": 1},
+                {"matrix": [1, 5], "x": 7, "y": 1},
+
+                {"matrix": [6, 0], "x": 10, "y": 1},
+                {"matrix": [6, 1], "x": 11, "y": 1},
+                {"matrix": [6, 2], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 4], "x": 14, "y": 1},
+                {"matrix": [6, 5], "x": 15, "y": 1},
+                {"matrix": [6, 6], "x": 16, "y": 1},
+
+                {"matrix": [8, 7], "x": 19, "y": 1},
+
+                {"matrix": [4, 5], "x": 0, "y": 2},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 3.25, "y": 2},
+                {"matrix": [2, 2], "x": 4.25, "y": 2},
+                {"matrix": [2, 3], "x": 5.25, "y": 2},
+                {"matrix": [2, 4], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 10.25, "y": 2},
+                {"matrix": [7, 1], "x": 11.25, "y": 2},
+                {"matrix": [7, 2], "x": 12.25, "y": 2},
+                {"matrix": [7, 3], "x": 13.25, "y": 2},
+                {"matrix": [7, 4], "x": 14.25, "y": 2},
+                {"matrix": [7, 5], "x": 15.25, "y": 2},
+                {"matrix": [6, 7], "x": 16.25, "y": 2},
+                {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"matrix": [9, 7], "x": 19, "y": 2},
+
+                {"matrix": [4, 6], "x": 0, "y": 3},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25},
+                {"matrix": [4, 1], "x": 2.75, "y": 3},
+                {"matrix": [3, 1], "x": 3.75, "y": 3},
+                {"matrix": [3, 2], "x": 4.75, "y": 3},
+                {"matrix": [3, 3], "x": 5.75, "y": 3},
+                {"matrix": [3, 4], "x": 6.75, "y": 3},
+                {"matrix": [3, 5], "x": 7.75, "y": 3},
+
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [8, 0], "x": 10.75, "y": 3},
+                {"matrix": [8, 1], "x": 11.75, "y": 3},
+                {"matrix": [8, 2], "x": 12.75, "y": 3},
+                {"matrix": [8, 3], "x": 13.75, "y": 3},
+                {"matrix": [8, 4], "x": 14.75, "y": 3},
+                {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75},
+
+                {"matrix": [8, 6], "x": 17.75, "y": 3.25},
+
+                {"matrix": [4, 7], "x": 0, "y": 4},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+
+                {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5},
+
+                {"matrix": [9, 3], "x": 16.75, "y": 4.25},
+                {"matrix": [9, 4], "x": 17.75, "y": 4.25},
+                {"matrix": [9, 5], "x": 18.75, "y": 4.25}
             ]
         }
     }

keyboards/mxss/info.json

@@ -952,62 +952,67 @@
         {"matrix": [0, 12], "x": 12, "y": 0},
         {"matrix": [0, 13], "x": 13, "y": 0},
         {"matrix": [0, 14], "x": 14, "y": 0},
-        {"matrix": [1, 0], "x": 15, "y": 0},
-        {"matrix": [1, 1], "x": 16, "y": 0},
-        {"matrix": [1, 2], "x": 17, "y": 0},
-        {"matrix": [1, 3], "x": 18, "y": 0},
-        {"matrix": [1, 4], "x": 19, "y": 0},
-        {"matrix": [1, 5], "x": 20, "y": 0},
-        {"matrix": [1, 6], "x": 21, "y": 0},
-        {"matrix": [1, 7], "x": 22, "y": 0},
-        {"matrix": [1, 8], "x": 23, "y": 0},
-        {"matrix": [1, 9], "x": 24, "y": 0},
-        {"matrix": [1, 10], "x": 25, "y": 0},
-        {"matrix": [1, 11], "x": 26, "y": 0},
-        {"matrix": [1, 12], "x": 27, "y": 0},
-        {"matrix": [1, 13], "x": 28, "y": 0},
-        {"matrix": [1, 14], "x": 29, "y": 0},
-        {"matrix": [2, 0], "x": 30, "y": 0},
-        {"matrix": [2, 1], "x": 31, "y": 0},
-        {"matrix": [2, 2], "x": 32, "y": 0},
-        {"matrix": [2, 3], "x": 33, "y": 0},
-        {"matrix": [2, 4], "x": 34, "y": 0},
-        {"matrix": [2, 5], "x": 35, "y": 0},
-        {"matrix": [2, 6], "x": 36, "y": 0},
-        {"matrix": [2, 7], "x": 37, "y": 0},
-        {"matrix": [2, 8], "x": 38, "y": 0},
-        {"matrix": [2, 9], "x": 39, "y": 0},
-        {"matrix": [2, 10], "x": 40, "y": 0},
-        {"matrix": [2, 11], "x": 41, "y": 0},
-        {"matrix": [2, 12], "x": 42, "y": 0},
-        {"matrix": [2, 13], "x": 43, "y": 0},
-        {"matrix": [2, 14], "x": 44, "y": 0},
-        {"matrix": [3, 0], "x": 45, "y": 0},
-        {"matrix": [3, 1], "x": 46, "y": 0},
-        {"matrix": [3, 2], "x": 47, "y": 0},
-        {"matrix": [3, 3], "x": 48, "y": 0},
-        {"matrix": [3, 4], "x": 49, "y": 0},
-        {"matrix": [3, 5], "x": 50, "y": 0},
-        {"matrix": [3, 6], "x": 51, "y": 0},
-        {"matrix": [3, 7], "x": 52, "y": 0},
-        {"matrix": [3, 8], "x": 53, "y": 0},
-        {"matrix": [3, 9], "x": 54, "y": 0},
-        {"matrix": [3, 10], "x": 55, "y": 0},
-        {"matrix": [3, 11], "x": 56, "y": 0},
-        {"matrix": [3, 12], "x": 57, "y": 0},
-        {"matrix": [3, 13], "x": 58, "y": 0},
-        {"matrix": [3, 14], "x": 59, "y": 0},
-        {"matrix": [4, 0], "x": 60, "y": 0},
-        {"matrix": [4, 1], "x": 61, "y": 0},
-        {"matrix": [4, 2], "x": 62, "y": 0},
-        {"matrix": [4, 3], "x": 63, "y": 0},
-        {"matrix": [4, 6], "x": 64, "y": 0},
-        {"matrix": [4, 8], "x": 65, "y": 0},
-        {"matrix": [4, 10], "x": 66, "y": 0},
-        {"matrix": [4, 11], "x": 67, "y": 0},
-        {"matrix": [4, 12], "x": 68, "y": 0},
-        {"matrix": [4, 13], "x": 69, "y": 0},
-        {"matrix": [4, 14], "x": 70, "y": 0}
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+        {"matrix": [1, 14], "x": 15, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+        {"matrix": [2, 14], "x": 15, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+        {"matrix": [3, 14], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+        {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 12], "x": 13, "y": 4},
+        {"matrix": [4, 13], "x": 14, "y": 4},
+        {"matrix": [4, 14], "x": 15, "y": 4}
       ]
     }
   }

keyboards/nasu/info.json

@@ -28,70 +28,81 @@
         "LAYOUT_alice": {
             "layout": [
                 {"matrix": [1, 0], "x": 0, "y": 0},
-                {"matrix": [0, 0], "x": 1, "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, "y": 0},
-                {"matrix": [0, 6], "x": 7, "y": 0},
-                {"matrix": [0, 7], "x": 8, "y": 0},
-                {"matrix": [0, 8], "x": 9, "y": 0},
-                {"matrix": [0, 9], "x": 10, "y": 0},
-                {"matrix": [0, 10], "x": 11, "y": 0},
-                {"matrix": [0, 11], "x": 12, "y": 0},
-                {"matrix": [0, 12], "x": 13, "y": 0},
-                {"matrix": [0, 13], "x": 14, "y": 0},
-                {"matrix": [2, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [3, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
-                {"matrix": [4, 1], "x": 58, "y": 0},
-                {"matrix": [4, 3], "x": 59, "y": 0},
-                {"matrix": [4, 5], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 8], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 14], "x": 64, "y": 0}
+
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [0, 3], "x": 4.25, "y": 0},
+                {"matrix": [0, 4], "x": 5.25, "y": 0},
+                {"matrix": [0, 5], "x": 6.25, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 10.25, "y": 0},
+                {"matrix": [0, 8], "x": 11.25, "y": 0},
+                {"matrix": [0, 9], "x": 12.25, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice_split_bs": {

keyboards/nopunin10did/jabberwocky/v1/info.json

@@ -22,119 +22,137 @@
     "layouts": {
         "LAYOUT_lh": {
             "layout": [
-                {"matrix": [0, 8], "x": 0, "y": 0},
-                {"matrix": [1, 8], "x": 1, "y": 0},
-                {"matrix": [0, 9], "x": 2, "y": 0},
-                {"matrix": [1, 9], "x": 3, "y": 0},
-                {"matrix": [7, 0], "x": 4, "y": 0},
-                {"matrix": [1, 1], "x": 5, "y": 0},
-                {"matrix": [0, 1], "x": 6, "y": 0},
-                {"matrix": [1, 2], "x": 7, "y": 0},
-                {"matrix": [0, 2], "x": 8, "y": 0},
-                {"matrix": [1, 3], "x": 9, "y": 0},
-                {"matrix": [0, 3], "x": 10, "y": 0},
-                {"matrix": [0, 4], "x": 11, "y": 0},
-                {"matrix": [1, 4], "x": 12, "y": 0},
-                {"matrix": [0, 5], "x": 13, "y": 0},
-                {"matrix": [1, 5], "x": 14, "y": 0},
-                {"matrix": [0, 6], "x": 15, "y": 0},
-                {"matrix": [1, 6], "x": 16, "y": 0},
-                {"matrix": [0, 7], "x": 17, "y": 0},
-                {"matrix": [1, 7], "x": 18, "y": 0},
-                {"matrix": [0, 0], "x": 19, "y": 0},
-                {"matrix": [1, 0], "x": 20, "y": 0},
-                {"matrix": [2, 8], "x": 21, "y": 0},
-                {"matrix": [3, 8], "x": 22, "y": 0},
-                {"matrix": [2, 9], "x": 23, "y": 0},
-                {"matrix": [3, 9], "x": 24, "y": 0},
-                {"matrix": [4, 0], "x": 25, "y": 0},
-                {"matrix": [2, 1], "x": 26, "y": 0},
-                {"matrix": [3, 1], "x": 27, "y": 0},
-                {"matrix": [2, 2], "x": 28, "y": 0},
-                {"matrix": [3, 2], "x": 29, "y": 0},
-                {"matrix": [2, 3], "x": 30, "y": 0},
-                {"matrix": [2, 4], "x": 31, "y": 0},
-                {"matrix": [3, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [3, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [3, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [3, 7], "x": 38, "y": 0},
-                {"matrix": [2, 0], "x": 39, "y": 0},
-                {"matrix": [4, 8], "x": 40, "y": 0},
-                {"matrix": [5, 8], "x": 41, "y": 0},
-                {"matrix": [4, 9], "x": 42, "y": 0},
-                {"matrix": [5, 9], "x": 43, "y": 0},
-                {"matrix": [6, 0], "x": 44, "y": 0},
-                {"matrix": [4, 1], "x": 45, "y": 0},
-                {"matrix": [5, 1], "x": 46, "y": 0},
-                {"matrix": [4, 2], "x": 47, "y": 0},
-                {"matrix": [5, 2], "x": 48, "y": 0},
-                {"matrix": [4, 3], "x": 49, "y": 0},
-                {"matrix": [4, 4], "x": 50, "y": 0},
-                {"matrix": [5, 4], "x": 51, "y": 0},
-                {"matrix": [4, 5], "x": 52, "y": 0},
-                {"matrix": [5, 5], "x": 53, "y": 0},
-                {"matrix": [4, 6], "x": 54, "y": 0},
-                {"matrix": [5, 6], "x": 55, "y": 0},
-                {"matrix": [4, 7], "x": 56, "y": 0},
-                {"matrix": [5, 7], "x": 57, "y": 0},
-                {"matrix": [6, 8], "x": 58, "y": 0},
-                {"matrix": [7, 8], "x": 59, "y": 0},
-                {"matrix": [6, 9], "x": 60, "y": 0},
-                {"matrix": [7, 9], "x": 61, "y": 0},
-                {"matrix": [7, 1], "x": 62, "y": 0},
-                {"matrix": [6, 1], "x": 63, "y": 0},
-                {"matrix": [7, 2], "x": 64, "y": 0},
-                {"matrix": [6, 2], "x": 65, "y": 0},
-                {"matrix": [7, 3], "x": 66, "y": 0},
-                {"matrix": [6, 3], "x": 67, "y": 0},
-                {"matrix": [6, 4], "x": 68, "y": 0},
-                {"matrix": [7, 4], "x": 69, "y": 0},
-                {"matrix": [6, 5], "x": 70, "y": 0},
-                {"matrix": [7, 5], "x": 71, "y": 0},
-                {"matrix": [6, 6], "x": 72, "y": 0},
-                {"matrix": [7, 6], "x": 73, "y": 0},
-                {"matrix": [6, 7], "x": 74, "y": 0},
-                {"matrix": [7, 7], "x": 75, "y": 0},
-                {"matrix": [8, 8], "x": 76, "y": 0},
-                {"matrix": [9, 8], "x": 77, "y": 0},
-                {"matrix": [8, 9], "x": 78, "y": 0},
-                {"matrix": [9, 9], "x": 79, "y": 0},
-                {"matrix": [8, 0], "x": 80, "y": 0},
-                {"matrix": [9, 0], "x": 81, "y": 0},
-                {"matrix": [8, 1], "x": 82, "y": 0},
-                {"matrix": [9, 1], "x": 83, "y": 0},
-                {"matrix": [8, 2], "x": 84, "y": 0},
-                {"matrix": [9, 2], "x": 85, "y": 0},
-                {"matrix": [8, 3], "x": 86, "y": 0},
-                {"matrix": [9, 3], "x": 87, "y": 0},
-                {"matrix": [10, 4], "x": 88, "y": 0},
-                {"matrix": [8, 4], "x": 89, "y": 0},
-                {"matrix": [9, 4], "x": 90, "y": 0},
-                {"matrix": [8, 5], "x": 91, "y": 0},
-                {"matrix": [9, 5], "x": 92, "y": 0},
-                {"matrix": [8, 6], "x": 93, "y": 0},
-                {"matrix": [9, 6], "x": 94, "y": 0},
-                {"matrix": [8, 7], "x": 95, "y": 0},
-                {"matrix": [9, 7], "x": 96, "y": 0},
-                {"matrix": [10, 8], "x": 97, "y": 0},
-                {"matrix": [11, 8], "x": 98, "y": 0},
-                {"matrix": [10, 9], "x": 99, "y": 0},
-                {"matrix": [11, 9], "x": 100, "y": 0},
-                {"matrix": [10, 0], "x": 101, "y": 0},
-                {"matrix": [10, 1], "x": 102, "y": 0},
-                {"matrix": [10, 2], "x": 103, "y": 0},
-                {"matrix": [10, 3], "x": 104, "y": 0},
-                {"matrix": [11, 3], "x": 105, "y": 0},
-                {"matrix": [11, 4], "x": 106, "y": 0},
-                {"matrix": [10, 5], "x": 107, "y": 0},
-                {"matrix": [11, 5], "x": 108, "y": 0},
-                {"matrix": [10, 6], "x": 109, "y": 0},
-                {"matrix": [11, 6], "x": 110, "y": 0},
-                {"matrix": [10, 7], "x": 111, "y": 0},
-                {"matrix": [11, 7], "x": 112, "y": 0}
+                {"matrix": [0, 8], "x": 0, "y": 0.125},
+                {"matrix": [1, 8], "x": 1, "y": 0.125},
+                {"matrix": [0, 9], "x": 2, "y": 0.125},
+                {"matrix": [1, 9], "x": 3, "y": 0.125},
+
+                {"matrix": [7, 0], "x": 5, "y": 0.125},
+
+                {"matrix": [1, 1], "x": 6.5, "y": 0.125},
+                {"matrix": [0, 1], "x": 7.5, "y": 0.125},
+                {"matrix": [1, 2], "x": 8.5, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [0, 2], "x": 9.5, "y": 0, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [1, 3], "x": 10.5, "y": 0.125, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [0, 3], "x": 11.5, "y": 0.25, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [0, 4], "x": 14.5, "y": 0.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [1, 4], "x": 15.5, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [0, 5], "x": 16.5, "y": 0, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [1, 5], "x": 17.5, "y": 0.125, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [0, 6], "x": 18.5, "y": 0.125},
+                {"matrix": [1, 6], "x": 19.5, "y": 0.125},
+                {"matrix": [0, 7], "x": 20.625, "y": 0.125},
+                {"matrix": [1, 7], "x": 21.625, "y": 0.125},
+                {"matrix": [0, 0], "x": 22.75, "y": 0.125},
+                {"matrix": [1, 0], "x": 23.75, "y": 0.125},
+
+                {"matrix": [2, 8], "x": 0, "y": 1.375},
+                {"matrix": [3, 8], "x": 1, "y": 1.375},
+                {"matrix": [2, 9], "x": 2, "y": 1.375},
+                {"matrix": [3, 9], "x": 3, "y": 1.375},
+
+                {"matrix": [4, 0], "x": 6.25, "y": 1.375},
+                {"matrix": [2, 1], "x": 7.25, "y": 1.375},
+                {"matrix": [3, 1], "x": 8.5, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [2, 2], "x": 9.5, "y": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [3, 2], "x": 10.5, "y": 1.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [2, 3], "x": 11.5, "y": 1.5, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [2, 4], "x": 14.5, "y": 1.5, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [3, 4], "x": 15.5, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [2, 5], "x": 16.5, "y": 1.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [3, 5], "x": 17.5, "y": 1.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [2, 6], "x": 18.75, "y": 1.375},
+                {"matrix": [3, 6], "x": 19.75, "y": 1.375},
+                {"matrix": [2, 7], "x": 20.75, "y": 1.375},
+                {"matrix": [3, 7], "x": 21.75, "y": 1.375},
+                {"matrix": [2, 0], "x": 22.75, "y": 1.375},
+
+                {"matrix": [4, 8], "x": 0, "y": 2.375},
+                {"matrix": [5, 8], "x": 1, "y": 2.375},
+                {"matrix": [4, 9], "x": 2, "y": 2.375},
+                {"matrix": [5, 9], "x": 3, "y": 2.375},
+
+                {"matrix": [6, 0], "x": 5.5, "y": 2.375, "w": 1.5},
+                {"matrix": [4, 1], "x": 7, "y": 2.375},
+                {"matrix": [5, 1], "x": 8.5, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [4, 2], "x": 9.5, "y": 2.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [5, 2], "x": 10.5, "y": 2.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [4, 3], "x": 11.5, "y": 2.5, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [4, 4], "x": 14.5, "y": 2.5, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [5, 4], "x": 15.5, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [4, 5], "x": 16.5, "y": 2.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [5, 5], "x": 17.5, "y": 2.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [4, 6], "x": 19, "y": 2.375},
+                {"matrix": [5, 6], "x": 20, "y": 2.375},
+                {"matrix": [4, 7], "x": 21, "y": 2.375},
+                {"matrix": [5, 7], "x": 22, "y": 2.375, "w": 1.5},
+
+                {"matrix": [6, 8], "x": 0, "y": 3.375},
+                {"matrix": [7, 8], "x": 1, "y": 3.375},
+                {"matrix": [6, 9], "x": 2, "y": 3.375},
+                {"matrix": [7, 9], "x": 3, "y": 3.375},
+
+                {"matrix": [7, 1], "x": 5, "y": 3.375, "w": 1.75},
+                {"matrix": [6, 1], "x": 6.75, "y": 3.375},
+                {"matrix": [7, 2], "x": 8.5, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [6, 2], "x": 9.5, "y": 3.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [7, 3], "x": 10.5, "y": 3.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [6, 3], "x": 11.5, "y": 3.5, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [6, 4], "x": 14.5, "y": 3.5, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [7, 4], "x": 15.5, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [6, 5], "x": 16.5, "y": 3.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [7, 5], "x": 17.5, "y": 3.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [6, 6], "x": 19.25, "y": 3.375},
+                {"matrix": [7, 6], "x": 20.25, "y": 3.375},
+                {"matrix": [6, 7], "x": 21.25, "y": 3.375},
+                {"matrix": [7, 7], "x": 22.25, "y": 3.375, "w": 1.25},
+
+                {"matrix": [8, 8], "x": 0, "y": 4.375},
+                {"matrix": [9, 8], "x": 1, "y": 4.375},
+                {"matrix": [8, 9], "x": 2, "y": 4.375},
+                {"matrix": [9, 9], "x": 3, "y": 4.375},
+
+                {"matrix": [8, 0], "x": 4.25, "y": 4.375, "w": 1.25},
+                {"matrix": [9, 0], "x": 5.5, "y": 4.375},
+                {"matrix": [8, 1], "x": 6.5, "y": 4.375},
+                {"matrix": [9, 1], "x": 8.5, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [8, 2], "x": 9.5, "y": 4.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [9, 2], "x": 10.5, "y": 4.375, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [8, 3], "x": 11.5, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [9, 3], "x": 12.5, "y": 4.5, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [10, 4], "x": 13.5, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [8, 4], "x": 14.5, "y": 4.5, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [9, 4], "x": 15.5, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [8, 5], "x": 16.5, "y": 4.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [9, 5], "x": 17.5, "y": 4.375, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [8, 6], "x": 19.5, "y": 4.375},
+                {"matrix": [9, 6], "x": 20.5, "y": 4.375},
+                {"matrix": [8, 7], "x": 21.5, "y": 4.375, "w": 1.25},
+                {"matrix": [9, 7], "x": 22.75, "y": 4.375},
+
+                {"matrix": [10, 8], "x": 0, "y": 5.375},
+                {"matrix": [11, 8], "x": 1, "y": 5.375},
+                {"matrix": [10, 9], "x": 2, "y": 5.375},
+                {"matrix": [11, 9], "x": 3, "y": 5.375},
+
+                {"matrix": [10, 0], "x": 4.75, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 1], "x": 6, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 2], "x": 9, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [10, 3], "x": 10.25, "y": 5.375, "w": 1.25, "r": 14, "rx": 4, "ry": 2.5},
+                {"matrix": [11, 3], "x": 11.5, "y": 5.5, "w": 2, "r": 14, "rx": 4, "ry": 2.5},
+
+                {"matrix": [11, 4], "x": 13.5, "y": 5.5, "w": 2.75, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [10, 5], "x": 16.25, "y": 5.375, "w": 1.25, "r": -14, "rx": 13.25, "ry": 2.5},
+                {"matrix": [11, 5], "x": 19.25, "y": 5.375, "w": 1.25},
+                {"matrix": [10, 6], "x": 20.5, "y": 5.375, "w": 1.25},
+                {"matrix": [11, 6], "x": 21.75, "y": 5.375},
+                {"matrix": [10, 7], "x": 22.75, "y": 5.375},
+                {"matrix": [11, 7], "x": 23.75, "y": 5.375}
             ]
         },
         "LAYOUT_rh": {
@@ -245,8 +263,8 @@
                 {"matrix": [8, 6], "x": 15.25, "y": 4.375},
                 {"matrix": [9, 6], "x": 16.25, "y": 4.375},
                 {"matrix": [8, 7], "x": 17.25, "y": 4.375, "w": 1.25},
-
                 {"matrix": [9, 7], "x": 18.5, "y": 4.375},
+
                 {"matrix": [8, 8], "x": 20.75, "y": 4.375},
                 {"matrix": [9, 8], "x": 21.75, "y": 4.375},
                 {"matrix": [8, 9], "x": 22.75, "y": 4.375},

keyboards/phase_studio/titan65/soldered/info.json

@@ -32,39 +32,39 @@
                 {"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": 13, "y": 0},
-                {"matrix": [0, 15], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                {"matrix": [1, 2], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [1, 3], "x": 1.5, "y": 1},
-                {"matrix": [1, 4], "x": 2.5, "y": 1},
-                {"matrix": [1, 5], "x": 3.5, "y": 1},
-                {"matrix": [1, 6], "x": 4.5, "y": 1},
-                {"matrix": [1, 7], "x": 5.5, "y": 1},
-                {"matrix": [1, 8], "x": 6.5, "y": 1},
-                {"matrix": [1, 9], "x": 7.5, "y": 1},
-                {"matrix": [1, 10], "x": 8.5, "y": 1},
-                {"matrix": [1, 11], "x": 9.5, "y": 1},
-                {"matrix": [1, 12], "x": 10.5, "y": 1},
-                {"matrix": [1, 13], "x": 11.5, "y": 1},
-                {"matrix": [1, 14], "x": 12.5, "y": 1},
-                {"matrix": [1, 15], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [2, 0], "x": 15, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                {"matrix": [2, 2], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [2, 3], "x": 1.75, "y": 2},
-                {"matrix": [2, 4], "x": 2.75, "y": 2},
-                {"matrix": [2, 5], "x": 3.75, "y": 2},
-                {"matrix": [2, 6], "x": 4.75, "y": 2},
-                {"matrix": [2, 7], "x": 5.75, "y": 2},
-                {"matrix": [2, 8], "x": 6.75, "y": 2},
-                {"matrix": [2, 9], "x": 7.75, "y": 2},
-                {"matrix": [2, 10], "x": 8.75, "y": 2},
-                {"matrix": [2, 11], "x": 9.75, "y": 2},
-                {"matrix": [2, 12], "x": 10.75, "y": 2},
-                {"matrix": [2, 13], "x": 11.75, "y": 2},
-                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
                 {"matrix": [2, 15], "x": 15, "y": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
@@ -84,11 +84,11 @@
                 {"matrix": [3, 15], "x": 15, "y": 3},
 
                 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4},
-                {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25},
-                {"matrix": [4, 7], "x": 3.5, "y": 4, "w": 6.25},
-                {"matrix": [4, 11], "x": 9.75, "y": 4, "w": 1.25},
-                {"matrix": [4, 12], "x": 11, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
 
                 {"matrix": [4, 13], "x": 13, "y": 4},
                 {"matrix": [4, 14], "x": 14, "y": 4},
@@ -110,60 +110,65 @@
                 {"matrix": [0, 10], "x": 10, "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, 15], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 2], "x": 16, "y": 0},
-                {"matrix": [1, 3], "x": 17, "y": 0},
-                {"matrix": [1, 4], "x": 18, "y": 0},
-                {"matrix": [1, 5], "x": 19, "y": 0},
-                {"matrix": [1, 6], "x": 20, "y": 0},
-                {"matrix": [1, 7], "x": 21, "y": 0},
-                {"matrix": [1, 8], "x": 22, "y": 0},
-                {"matrix": [1, 9], "x": 23, "y": 0},
-                {"matrix": [1, 10], "x": 24, "y": 0},
-                {"matrix": [1, 11], "x": 25, "y": 0},
-                {"matrix": [1, 12], "x": 26, "y": 0},
-                {"matrix": [1, 13], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
-                {"matrix": [1, 15], "x": 29, "y": 0},
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [2, 14], "x": 42, "y": 0},
-                {"matrix": [2, 15], "x": 43, "y": 0},
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 3], "x": 45, "y": 0},
-                {"matrix": [3, 4], "x": 46, "y": 0},
-                {"matrix": [3, 5], "x": 47, "y": 0},
-                {"matrix": [3, 6], "x": 48, "y": 0},
-                {"matrix": [3, 7], "x": 49, "y": 0},
-                {"matrix": [3, 8], "x": 50, "y": 0},
-                {"matrix": [3, 9], "x": 51, "y": 0},
-                {"matrix": [3, 10], "x": 52, "y": 0},
-                {"matrix": [3, 11], "x": 53, "y": 0},
-                {"matrix": [3, 12], "x": 54, "y": 0},
-                {"matrix": [3, 13], "x": 55, "y": 0},
-                {"matrix": [3, 14], "x": 56, "y": 0},
-                {"matrix": [3, 15], "x": 57, "y": 0},
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 2], "x": 59, "y": 0},
-                {"matrix": [4, 3], "x": 60, "y": 0},
-                {"matrix": [4, 7], "x": 61, "y": 0},
-                {"matrix": [4, 11], "x": 62, "y": 0},
-                {"matrix": [4, 12], "x": 63, "y": 0},
-                {"matrix": [4, 13], "x": 64, "y": 0},
-                {"matrix": [4, 14], "x": 65, "y": 0},
-                {"matrix": [4, 15], "x": 66, "y": 0}
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_ansi_split_bspc": {
@@ -184,58 +189,63 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
-                {"matrix": [1, 15], "x": 30, "y": 0},
-                {"matrix": [2, 0], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
-                {"matrix": [3, 15], "x": 58, "y": 0},
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 3], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_iso": {
@@ -253,61 +263,66 @@
                 {"matrix": [0, 10], "x": 10, "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, 15], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 2], "x": 16, "y": 0},
-                {"matrix": [1, 3], "x": 17, "y": 0},
-                {"matrix": [1, 4], "x": 18, "y": 0},
-                {"matrix": [1, 5], "x": 19, "y": 0},
-                {"matrix": [1, 6], "x": 20, "y": 0},
-                {"matrix": [1, 7], "x": 21, "y": 0},
-                {"matrix": [1, 8], "x": 22, "y": 0},
-                {"matrix": [1, 9], "x": 23, "y": 0},
-                {"matrix": [1, 10], "x": 24, "y": 0},
-                {"matrix": [1, 11], "x": 25, "y": 0},
-                {"matrix": [1, 12], "x": 26, "y": 0},
-                {"matrix": [1, 13], "x": 27, "y": 0},
-                {"matrix": [1, 15], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 2], "x": 30, "y": 0},
-                {"matrix": [2, 3], "x": 31, "y": 0},
-                {"matrix": [2, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [2, 6], "x": 34, "y": 0},
-                {"matrix": [2, 7], "x": 35, "y": 0},
-                {"matrix": [2, 8], "x": 36, "y": 0},
-                {"matrix": [2, 9], "x": 37, "y": 0},
-                {"matrix": [2, 10], "x": 38, "y": 0},
-                {"matrix": [2, 11], "x": 39, "y": 0},
-                {"matrix": [2, 12], "x": 40, "y": 0},
-                {"matrix": [2, 13], "x": 41, "y": 0},
-                {"matrix": [2, 14], "x": 42, "y": 0},
-                {"matrix": [2, 15], "x": 43, "y": 0},
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
-                {"matrix": [3, 15], "x": 58, "y": 0},
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 3], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0},
-                {"matrix": [4, 15], "x": 67, "y": 0}
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_iso_split_bspc": {
@@ -328,59 +343,64 @@
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [0, 14], "x": 14, "y": 0},
                 {"matrix": [0, 15], "x": 15, "y": 0},
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 15], "x": 29, "y": 0},
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
-                {"matrix": [2, 15], "x": 44, "y": 0},
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 2], "x": 46, "y": 0},
-                {"matrix": [3, 3], "x": 47, "y": 0},
-                {"matrix": [3, 4], "x": 48, "y": 0},
-                {"matrix": [3, 5], "x": 49, "y": 0},
-                {"matrix": [3, 6], "x": 50, "y": 0},
-                {"matrix": [3, 7], "x": 51, "y": 0},
-                {"matrix": [3, 8], "x": 52, "y": 0},
-                {"matrix": [3, 9], "x": 53, "y": 0},
-                {"matrix": [3, 10], "x": 54, "y": 0},
-                {"matrix": [3, 11], "x": 55, "y": 0},
-                {"matrix": [3, 12], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
-                {"matrix": [3, 15], "x": 59, "y": 0},
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 3], "x": 62, "y": 0},
-                {"matrix": [4, 7], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0},
-                {"matrix": [4, 15], "x": 68, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3},
+                {"matrix": [3, 3], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3},
+                {"matrix": [3, 5], "x": 4.25, "y": 3},
+                {"matrix": [3, 6], "x": 5.25, "y": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 8], "x": 7.25, "y": 3},
+                {"matrix": [3, 9], "x": 8.25, "y": 3},
+                {"matrix": [3, 10], "x": 9.25, "y": 3},
+                {"matrix": [3, 11], "x": 10.25, "y": 3},
+                {"matrix": [3, 12], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }

keyboards/rotor/info.json

@@ -110,86 +110,96 @@
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "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, "y": 0},
-                {"matrix": [0, 16], "x": 16, "y": 0},
-                {"matrix": [0, 17], "x": 17, "y": 0},
-                {"matrix": [1, 0], "x": 18, "y": 0},
-                {"matrix": [1, 1], "x": 19, "y": 0},
-                {"matrix": [1, 2], "x": 20, "y": 0},
-                {"matrix": [1, 3], "x": 21, "y": 0},
-                {"matrix": [1, 4], "x": 22, "y": 0},
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 6], "x": 24, "y": 0},
-                {"matrix": [1, 7], "x": 25, "y": 0},
-                {"matrix": [1, 8], "x": 26, "y": 0},
-                {"matrix": [1, 9], "x": 27, "y": 0},
-                {"matrix": [1, 10], "x": 28, "y": 0},
-                {"matrix": [1, 11], "x": 29, "y": 0},
-                {"matrix": [1, 12], "x": 30, "y": 0},
-                {"matrix": [1, 13], "x": 31, "y": 0},
-                {"matrix": [1, 14], "x": 32, "y": 0},
-                {"matrix": [1, 16], "x": 33, "y": 0},
-                {"matrix": [1, 17], "x": 34, "y": 0},
-                {"matrix": [2, 0], "x": 35, "y": 0},
-                {"matrix": [2, 1], "x": 36, "y": 0},
-                {"matrix": [2, 2], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [2, 4], "x": 39, "y": 0},
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 6], "x": 41, "y": 0},
-                {"matrix": [2, 7], "x": 42, "y": 0},
-                {"matrix": [2, 8], "x": 43, "y": 0},
-                {"matrix": [2, 9], "x": 44, "y": 0},
-                {"matrix": [2, 10], "x": 45, "y": 0},
-                {"matrix": [2, 11], "x": 46, "y": 0},
-                {"matrix": [2, 12], "x": 47, "y": 0},
-                {"matrix": [2, 13], "x": 48, "y": 0},
-                {"matrix": [2, 14], "x": 49, "y": 0},
-                {"matrix": [2, 16], "x": 50, "y": 0},
-                {"matrix": [2, 17], "x": 51, "y": 0},
-                {"matrix": [3, 0], "x": 52, "y": 0},
-                {"matrix": [3, 1], "x": 53, "y": 0},
-                {"matrix": [3, 2], "x": 54, "y": 0},
-                {"matrix": [3, 3], "x": 55, "y": 0},
-                {"matrix": [3, 4], "x": 56, "y": 0},
-                {"matrix": [3, 5], "x": 57, "y": 0},
-                {"matrix": [3, 6], "x": 58, "y": 0},
-                {"matrix": [3, 7], "x": 59, "y": 0},
-                {"matrix": [3, 8], "x": 60, "y": 0},
-                {"matrix": [3, 9], "x": 61, "y": 0},
-                {"matrix": [3, 10], "x": 62, "y": 0},
-                {"matrix": [3, 11], "x": 63, "y": 0},
-                {"matrix": [3, 12], "x": 64, "y": 0},
-                {"matrix": [3, 13], "x": 65, "y": 0},
-                {"matrix": [3, 14], "x": 66, "y": 0},
-                {"matrix": [3, 16], "x": 67, "y": 0},
-                {"matrix": [3, 17], "x": 68, "y": 0},
-                {"matrix": [4, 0], "x": 69, "y": 0},
-                {"matrix": [4, 1], "x": 70, "y": 0},
-                {"matrix": [4, 2], "x": 71, "y": 0},
-                {"matrix": [4, 3], "x": 72, "y": 0},
-                {"matrix": [4, 4], "x": 73, "y": 0},
-                {"matrix": [4, 6], "x": 74, "y": 0},
-                {"matrix": [4, 8], "x": 75, "y": 0},
-                {"matrix": [4, 10], "x": 76, "y": 0},
-                {"matrix": [4, 12], "x": 77, "y": 0},
-                {"matrix": [4, 13], "x": 78, "y": 0},
-                {"matrix": [4, 14], "x": 79, "y": 0},
-                {"matrix": [4, 16], "x": 80, "y": 0},
-                {"matrix": [4, 17], "x": 81, "y": 0}
+
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "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},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 16], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 17], "x": 17.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 16], "x": 16, "y": 2, "w": 1.25},
+                {"matrix": [2, 17], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [3, 17], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4},
+                {"matrix": [4, 16], "x": 16.25, "y": 4},
+                {"matrix": [4, 17], "x": 17.25, "y": 4}
             ]
         }
     }

keyboards/salicylic_acid3/naked48/rev1/info.json

@@ -97,55 +97,64 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [4, 1], "x": 12, "y": 0},
-                {"matrix": [1, 0], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 7], "x": 20, "y": 0},
-                {"matrix": [1, 8], "x": 21, "y": 0},
-                {"matrix": [1, 9], "x": 22, "y": 0},
-                {"matrix": [1, 10], "x": 23, "y": 0},
-                {"matrix": [1, 11], "x": 24, "y": 0},
-                {"matrix": [5, 0], "x": 25, "y": 0},
-                {"matrix": [5, 1], "x": 26, "y": 0},
-                {"matrix": [5, 2], "x": 27, "y": 0},
-                {"matrix": [2, 0], "x": 28, "y": 0},
-                {"matrix": [2, 1], "x": 29, "y": 0},
-                {"matrix": [2, 2], "x": 30, "y": 0},
-                {"matrix": [2, 3], "x": 31, "y": 0},
-                {"matrix": [2, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [2, 6], "x": 34, "y": 0},
-                {"matrix": [2, 7], "x": 35, "y": 0},
-                {"matrix": [2, 8], "x": 36, "y": 0},
-                {"matrix": [2, 9], "x": 37, "y": 0},
-                {"matrix": [2, 10], "x": 38, "y": 0},
-                {"matrix": [2, 11], "x": 39, "y": 0},
-                {"matrix": [6, 0], "x": 40, "y": 0},
-                {"matrix": [6, 1], "x": 41, "y": 0},
-                {"matrix": [6, 2], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [4, 1], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [5, 0], "x": 15, "y": 1},
+                {"matrix": [5, 1], "x": 16, "y": 1},
+                {"matrix": [5, 2], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [6, 0], "x": 15, "y": 2},
+                {"matrix": [6, 1], "x": 16, "y": 2},
+                {"matrix": [6, 2], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3}
             ]
         },
         "LAYOUT_with_setta21": {
@@ -156,69 +165,79 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [4, 0], "x": 12, "y": 0},
-                {"matrix": [4, 1], "x": 13, "y": 0},
-                {"matrix": [4, 2], "x": 14, "y": 0},
-                {"matrix": [4, 3], "x": 15, "y": 0},
-                {"matrix": [4, 4], "x": 16, "y": 0},
-                {"matrix": [4, 5], "x": 17, "y": 0},
-                {"matrix": [1, 0], "x": 18, "y": 0},
-                {"matrix": [1, 1], "x": 19, "y": 0},
-                {"matrix": [1, 2], "x": 20, "y": 0},
-                {"matrix": [1, 3], "x": 21, "y": 0},
-                {"matrix": [1, 4], "x": 22, "y": 0},
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 6], "x": 24, "y": 0},
-                {"matrix": [1, 7], "x": 25, "y": 0},
-                {"matrix": [1, 8], "x": 26, "y": 0},
-                {"matrix": [1, 9], "x": 27, "y": 0},
-                {"matrix": [1, 10], "x": 28, "y": 0},
-                {"matrix": [1, 11], "x": 29, "y": 0},
-                {"matrix": [5, 1], "x": 30, "y": 0},
-                {"matrix": [5, 2], "x": 31, "y": 0},
-                {"matrix": [5, 3], "x": 32, "y": 0},
-                {"matrix": [5, 4], "x": 33, "y": 0},
-                {"matrix": [5, 5], "x": 34, "y": 0},
-                {"matrix": [2, 0], "x": 35, "y": 0},
-                {"matrix": [2, 1], "x": 36, "y": 0},
-                {"matrix": [2, 2], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [2, 4], "x": 39, "y": 0},
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 6], "x": 41, "y": 0},
-                {"matrix": [2, 7], "x": 42, "y": 0},
-                {"matrix": [2, 8], "x": 43, "y": 0},
-                {"matrix": [2, 9], "x": 44, "y": 0},
-                {"matrix": [2, 10], "x": 45, "y": 0},
-                {"matrix": [2, 11], "x": 46, "y": 0},
-                {"matrix": [6, 0], "x": 47, "y": 0},
-                {"matrix": [6, 1], "x": 48, "y": 0},
-                {"matrix": [6, 2], "x": 49, "y": 0},
-                {"matrix": [6, 3], "x": 50, "y": 0},
-                {"matrix": [6, 4], "x": 51, "y": 0},
-                {"matrix": [6, 5], "x": 52, "y": 0},
-                {"matrix": [3, 0], "x": 53, "y": 0},
-                {"matrix": [3, 1], "x": 54, "y": 0},
-                {"matrix": [3, 2], "x": 55, "y": 0},
-                {"matrix": [3, 3], "x": 56, "y": 0},
-                {"matrix": [3, 4], "x": 57, "y": 0},
-                {"matrix": [3, 5], "x": 58, "y": 0},
-                {"matrix": [3, 6], "x": 59, "y": 0},
-                {"matrix": [3, 7], "x": 60, "y": 0},
-                {"matrix": [3, 8], "x": 61, "y": 0},
-                {"matrix": [3, 9], "x": 62, "y": 0},
-                {"matrix": [3, 10], "x": 63, "y": 0},
-                {"matrix": [3, 11], "x": 64, "y": 0},
-                {"matrix": [7, 0], "x": 65, "y": 0},
-                {"matrix": [7, 2], "x": 66, "y": 0},
-                {"matrix": [7, 4], "x": 67, "y": 0},
-                {"matrix": [7, 5], "x": 68, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [4, 0], "x": 15, "y": 0, "h": 2},
+                {"matrix": [4, 1], "x": 16, "y": 0},
+                {"matrix": [4, 2], "x": 17, "y": 0},
+                {"matrix": [4, 3], "x": 18, "y": 0},
+                {"matrix": [4, 4], "x": 19, "y": 0},
+                {"matrix": [4, 5], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [5, 1], "x": 16, "y": 1},
+                {"matrix": [5, 2], "x": 17, "y": 1},
+                {"matrix": [5, 3], "x": 18, "y": 1},
+                {"matrix": [5, 4], "x": 19, "y": 1},
+                {"matrix": [5, 5], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [6, 0], "x": 15, "y": 2},
+                {"matrix": [6, 1], "x": 16, "y": 2},
+                {"matrix": [6, 2], "x": 17, "y": 2},
+                {"matrix": [6, 3], "x": 18, "y": 2},
+                {"matrix": [6, 4], "x": 19, "y": 2},
+                {"matrix": [6, 5], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 1, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+
+                {"matrix": [7, 0], "x": 15, "y": 3, "w": 2},
+                {"matrix": [7, 2], "x": 17, "y": 3, "w": 2},
+                {"matrix": [7, 4], "x": 19, "y": 3},
+                {"matrix": [7, 5], "x": 20.25, "y": 3}
             ]
         }
     }

keyboards/salicylic_acid3/naked60/rev1/info.json

@@ -105,67 +105,78 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [5, 1], "x": 12, "y": 0},
-                {"matrix": [1, 0], "x": 13, "y": 0},
-                {"matrix": [1, 1], "x": 14, "y": 0},
-                {"matrix": [1, 2], "x": 15, "y": 0},
-                {"matrix": [1, 3], "x": 16, "y": 0},
-                {"matrix": [1, 4], "x": 17, "y": 0},
-                {"matrix": [1, 5], "x": 18, "y": 0},
-                {"matrix": [1, 6], "x": 19, "y": 0},
-                {"matrix": [1, 7], "x": 20, "y": 0},
-                {"matrix": [1, 8], "x": 21, "y": 0},
-                {"matrix": [1, 9], "x": 22, "y": 0},
-                {"matrix": [1, 10], "x": 23, "y": 0},
-                {"matrix": [1, 11], "x": 24, "y": 0},
-                {"matrix": [6, 0], "x": 25, "y": 0},
-                {"matrix": [6, 1], "x": 26, "y": 0},
-                {"matrix": [6, 2], "x": 27, "y": 0},
-                {"matrix": [2, 0], "x": 28, "y": 0},
-                {"matrix": [2, 1], "x": 29, "y": 0},
-                {"matrix": [2, 2], "x": 30, "y": 0},
-                {"matrix": [2, 3], "x": 31, "y": 0},
-                {"matrix": [2, 4], "x": 32, "y": 0},
-                {"matrix": [2, 5], "x": 33, "y": 0},
-                {"matrix": [2, 6], "x": 34, "y": 0},
-                {"matrix": [2, 7], "x": 35, "y": 0},
-                {"matrix": [2, 8], "x": 36, "y": 0},
-                {"matrix": [2, 9], "x": 37, "y": 0},
-                {"matrix": [2, 10], "x": 38, "y": 0},
-                {"matrix": [2, 11], "x": 39, "y": 0},
-                {"matrix": [7, 0], "x": 40, "y": 0},
-                {"matrix": [7, 1], "x": 41, "y": 0},
-                {"matrix": [7, 2], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [4, 0], "x": 55, "y": 0},
-                {"matrix": [4, 1], "x": 56, "y": 0},
-                {"matrix": [4, 2], "x": 57, "y": 0},
-                {"matrix": [4, 3], "x": 58, "y": 0},
-                {"matrix": [4, 4], "x": 59, "y": 0},
-                {"matrix": [4, 5], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 7], "x": 62, "y": 0},
-                {"matrix": [4, 8], "x": 63, "y": 0},
-                {"matrix": [4, 9], "x": 64, "y": 0},
-                {"matrix": [4, 10], "x": 65, "y": 0},
-                {"matrix": [4, 11], "x": 66, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [5, 1], "x": 16, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [6, 0], "x": 15, "y": 1},
+                {"matrix": [6, 1], "x": 16, "y": 1},
+                {"matrix": [6, 2], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [7, 0], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 16, "y": 2},
+                {"matrix": [7, 2], "x": 17, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
             ]
         },
         "LAYOUT_with_setta21": {
@@ -176,81 +187,93 @@
                 {"matrix": [0, 3], "x": 3, "y": 0},
                 {"matrix": [0, 4], "x": 4, "y": 0},
                 {"matrix": [0, 5], "x": 5, "y": 0},
-                {"matrix": [0, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [5, 0], "x": 12, "y": 0},
-                {"matrix": [5, 1], "x": 13, "y": 0},
-                {"matrix": [5, 2], "x": 14, "y": 0},
-                {"matrix": [5, 3], "x": 15, "y": 0},
-                {"matrix": [5, 4], "x": 16, "y": 0},
-                {"matrix": [5, 5], "x": 17, "y": 0},
-                {"matrix": [1, 0], "x": 18, "y": 0},
-                {"matrix": [1, 1], "x": 19, "y": 0},
-                {"matrix": [1, 2], "x": 20, "y": 0},
-                {"matrix": [1, 3], "x": 21, "y": 0},
-                {"matrix": [1, 4], "x": 22, "y": 0},
-                {"matrix": [1, 5], "x": 23, "y": 0},
-                {"matrix": [1, 6], "x": 24, "y": 0},
-                {"matrix": [1, 7], "x": 25, "y": 0},
-                {"matrix": [1, 8], "x": 26, "y": 0},
-                {"matrix": [1, 9], "x": 27, "y": 0},
-                {"matrix": [1, 10], "x": 28, "y": 0},
-                {"matrix": [1, 11], "x": 29, "y": 0},
-                {"matrix": [6, 1], "x": 30, "y": 0},
-                {"matrix": [6, 2], "x": 31, "y": 0},
-                {"matrix": [6, 3], "x": 32, "y": 0},
-                {"matrix": [6, 4], "x": 33, "y": 0},
-                {"matrix": [6, 5], "x": 34, "y": 0},
-                {"matrix": [2, 0], "x": 35, "y": 0},
-                {"matrix": [2, 1], "x": 36, "y": 0},
-                {"matrix": [2, 2], "x": 37, "y": 0},
-                {"matrix": [2, 3], "x": 38, "y": 0},
-                {"matrix": [2, 4], "x": 39, "y": 0},
-                {"matrix": [2, 5], "x": 40, "y": 0},
-                {"matrix": [2, 6], "x": 41, "y": 0},
-                {"matrix": [2, 7], "x": 42, "y": 0},
-                {"matrix": [2, 8], "x": 43, "y": 0},
-                {"matrix": [2, 9], "x": 44, "y": 0},
-                {"matrix": [2, 10], "x": 45, "y": 0},
-                {"matrix": [2, 11], "x": 46, "y": 0},
-                {"matrix": [7, 0], "x": 47, "y": 0},
-                {"matrix": [7, 1], "x": 48, "y": 0},
-                {"matrix": [7, 2], "x": 49, "y": 0},
-                {"matrix": [7, 3], "x": 50, "y": 0},
-                {"matrix": [7, 4], "x": 51, "y": 0},
-                {"matrix": [7, 5], "x": 52, "y": 0},
-                {"matrix": [3, 0], "x": 53, "y": 0},
-                {"matrix": [3, 1], "x": 54, "y": 0},
-                {"matrix": [3, 2], "x": 55, "y": 0},
-                {"matrix": [3, 3], "x": 56, "y": 0},
-                {"matrix": [3, 4], "x": 57, "y": 0},
-                {"matrix": [3, 5], "x": 58, "y": 0},
-                {"matrix": [3, 6], "x": 59, "y": 0},
-                {"matrix": [3, 7], "x": 60, "y": 0},
-                {"matrix": [3, 8], "x": 61, "y": 0},
-                {"matrix": [3, 9], "x": 62, "y": 0},
-                {"matrix": [3, 10], "x": 63, "y": 0},
-                {"matrix": [3, 11], "x": 64, "y": 0},
-                {"matrix": [8, 0], "x": 65, "y": 0},
-                {"matrix": [8, 2], "x": 66, "y": 0},
-                {"matrix": [8, 4], "x": 67, "y": 0},
-                {"matrix": [8, 5], "x": 68, "y": 0},
-                {"matrix": [4, 0], "x": 69, "y": 0},
-                {"matrix": [4, 1], "x": 70, "y": 0},
-                {"matrix": [4, 2], "x": 71, "y": 0},
-                {"matrix": [4, 3], "x": 72, "y": 0},
-                {"matrix": [4, 4], "x": 73, "y": 0},
-                {"matrix": [4, 5], "x": 74, "y": 0},
-                {"matrix": [4, 6], "x": 75, "y": 0},
-                {"matrix": [4, 7], "x": 76, "y": 0},
-                {"matrix": [4, 8], "x": 77, "y": 0},
-                {"matrix": [4, 9], "x": 78, "y": 0},
-                {"matrix": [4, 10], "x": 79, "y": 0},
-                {"matrix": [4, 11], "x": 80, "y": 0}
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+
+                {"matrix": [5, 0], "x": 15, "y": 0, "h": 2},
+                {"matrix": [5, 1], "x": 16, "y": 0},
+                {"matrix": [5, 2], "x": 17, "y": 0},
+                {"matrix": [5, 3], "x": 18, "y": 0},
+                {"matrix": [5, 4], "x": 19, "y": 0},
+                {"matrix": [5, 5], "x": 20.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1},
+
+                {"matrix": [6, 1], "x": 16, "y": 1},
+                {"matrix": [6, 2], "x": 17, "y": 1},
+                {"matrix": [6, 3], "x": 18, "y": 1},
+                {"matrix": [6, 4], "x": 19, "y": 1},
+                {"matrix": [6, 5], "x": 20.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+
+                {"matrix": [7, 0], "x": 15, "y": 2},
+                {"matrix": [7, 1], "x": 16, "y": 2},
+                {"matrix": [7, 2], "x": 17, "y": 2},
+                {"matrix": [7, 3], "x": 18, "y": 2},
+                {"matrix": [7, 4], "x": 19, "y": 2},
+                {"matrix": [7, 5], "x": 20.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3},
+
+                {"matrix": [8, 0], "x": 15, "y": 3, "w": 2},
+                {"matrix": [8, 2], "x": 17, "y": 3, "w": 2},
+                {"matrix": [8, 4], "x": 19, "y": 3},
+                {"matrix": [8, 5], "x": 20.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4}
             ]
         }
     }

keyboards/tkw/stoutgat/v1/info.json

@@ -38,65 +38,65 @@
                 {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
-                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
-                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
-                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
-                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
-                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
-                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
-                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
-                {"label": "K1D", "matrix": [1, 13], "x": 28, "y": 0},
-                {"label": "K1E", "matrix": [1, 14], "x": 29, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "K20", "matrix": [2, 0], "x": 30, "y": 0},
-                {"label": "K21", "matrix": [2, 1], "x": 31, "y": 0},
-                {"label": "K22", "matrix": [2, 2], "x": 32, "y": 0},
-                {"label": "K23", "matrix": [2, 3], "x": 33, "y": 0},
-                {"label": "K24", "matrix": [2, 4], "x": 34, "y": 0},
-                {"label": "K25", "matrix": [2, 5], "x": 35, "y": 0},
-                {"label": "K26", "matrix": [2, 6], "x": 36, "y": 0},
-                {"label": "K27", "matrix": [2, 7], "x": 37, "y": 0},
-                {"label": "K28", "matrix": [2, 8], "x": 38, "y": 0},
-                {"label": "K29", "matrix": [2, 9], "x": 39, "y": 0},
-                {"label": "K2A", "matrix": [2, 10], "x": 40, "y": 0},
-                {"label": "K2B", "matrix": [2, 11], "x": 41, "y": 0},
-                {"label": "K2D", "matrix": [2, 13], "x": 42, "y": 0},
-                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K32", "matrix": [3, 2], "x": 45, "y": 0},
-                {"label": "K33", "matrix": [3, 3], "x": 46, "y": 0},
-                {"label": "K34", "matrix": [3, 4], "x": 47, "y": 0},
-                {"label": "K35", "matrix": [3, 5], "x": 48, "y": 0},
-                {"label": "K36", "matrix": [3, 6], "x": 49, "y": 0},
-                {"label": "K37", "matrix": [3, 7], "x": 50, "y": 0},
-                {"label": "K38", "matrix": [3, 8], "x": 51, "y": 0},
-                {"label": "K39", "matrix": [3, 9], "x": 52, "y": 0},
-                {"label": "K3A", "matrix": [3, 10], "x": 53, "y": 0},
-                {"label": "K3B", "matrix": [3, 11], "x": 54, "y": 0},
-                {"label": "K3C", "matrix": [3, 12], "x": 55, "y": 0},
-                {"label": "K3D", "matrix": [3, 13], "x": 56, "y": 0},
-                {"label": "K3E", "matrix": [3, 14], "x": 57, "y": 0},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "K40", "matrix": [4, 0], "x": 58, "y": 0},
-                {"label": "K41", "matrix": [4, 1], "x": 59, "y": 0},
-                {"label": "K42", "matrix": [4, 2], "x": 60, "y": 0},
-                {"label": "K46", "matrix": [4, 6], "x": 61, "y": 0},
-                {"label": "K49", "matrix": [4, 9], "x": 62, "y": 0},
-                {"label": "K4A", "matrix": [4, 10], "x": 63, "y": 0},
-                {"label": "K4B", "matrix": [4, 11], "x": 64, "y": 0},
-                {"label": "K4C", "matrix": [4, 12], "x": 65, "y": 0},
-                {"label": "K4D", "matrix": [4, 13], "x": 66, "y": 0},
-                {"label": "K4E", "matrix": [4, 14], "x": 67, "y": 0}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
@@ -114,66 +114,66 @@
                 {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
                 {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
-                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
-                {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "x": 16, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "x": 17, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "x": 18, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "x": 19, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "x": 20, "y": 0},
-                {"label": "K16", "matrix": [1, 6], "x": 21, "y": 0},
-                {"label": "K17", "matrix": [1, 7], "x": 22, "y": 0},
-                {"label": "K18", "matrix": [1, 8], "x": 23, "y": 0},
-                {"label": "K19", "matrix": [1, 9], "x": 24, "y": 0},
-                {"label": "K1A", "matrix": [1, 10], "x": 25, "y": 0},
-                {"label": "K1B", "matrix": [1, 11], "x": 26, "y": 0},
-                {"label": "K1C", "matrix": [1, 12], "x": 27, "y": 0},
-                {"label": "K1E", "matrix": [1, 14], "x": 28, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label": "K20", "matrix": [2, 0], "x": 29, "y": 0},
-                {"label": "K21", "matrix": [2, 1], "x": 30, "y": 0},
-                {"label": "K22", "matrix": [2, 2], "x": 31, "y": 0},
-                {"label": "K23", "matrix": [2, 3], "x": 32, "y": 0},
-                {"label": "K24", "matrix": [2, 4], "x": 33, "y": 0},
-                {"label": "K25", "matrix": [2, 5], "x": 34, "y": 0},
-                {"label": "K26", "matrix": [2, 6], "x": 35, "y": 0},
-                {"label": "K27", "matrix": [2, 7], "x": 36, "y": 0},
-                {"label": "K28", "matrix": [2, 8], "x": 37, "y": 0},
-                {"label": "K29", "matrix": [2, 9], "x": 38, "y": 0},
-                {"label": "K2A", "matrix": [2, 10], "x": 39, "y": 0},
-                {"label": "K2B", "matrix": [2, 11], "x": 40, "y": 0},
-                {"label": "K2D", "matrix": [2, 13], "x": 41, "y": 0},
-                {"label": "K1D", "matrix": [1, 13], "x": 42, "y": 0},
-                {"label": "K2E", "matrix": [2, 14], "x": 43, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K2D", "matrix": [2, 13], "x": 12.75, "y": 2},
+                {"label": "K1D", "matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label": "K30", "matrix": [3, 0], "x": 44, "y": 0},
-                {"label": "K31", "matrix": [3, 1], "x": 45, "y": 0},
-                {"label": "K32", "matrix": [3, 2], "x": 46, "y": 0},
-                {"label": "K33", "matrix": [3, 3], "x": 47, "y": 0},
-                {"label": "K34", "matrix": [3, 4], "x": 48, "y": 0},
-                {"label": "K35", "matrix": [3, 5], "x": 49, "y": 0},
-                {"label": "K36", "matrix": [3, 6], "x": 50, "y": 0},
-                {"label": "K37", "matrix": [3, 7], "x": 51, "y": 0},
-                {"label": "K38", "matrix": [3, 8], "x": 52, "y": 0},
-                {"label": "K39", "matrix": [3, 9], "x": 53, "y": 0},
-                {"label": "K3A", "matrix": [3, 10], "x": 54, "y": 0},
-                {"label": "K3B", "matrix": [3, 11], "x": 55, "y": 0},
-                {"label": "K3C", "matrix": [3, 12], "x": 56, "y": 0},
-                {"label": "K3D", "matrix": [3, 13], "x": 57, "y": 0},
-                {"label": "K3E", "matrix": [3, 14], "x": 58, "y": 0},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label": "K40", "matrix": [4, 0], "x": 59, "y": 0},
-                {"label": "K41", "matrix": [4, 1], "x": 60, "y": 0},
-                {"label": "K42", "matrix": [4, 2], "x": 61, "y": 0},
-                {"label": "K46", "matrix": [4, 6], "x": 62, "y": 0},
-                {"label": "K49", "matrix": [4, 9], "x": 63, "y": 0},
-                {"label": "K4A", "matrix": [4, 10], "x": 64, "y": 0},
-                {"label": "K4B", "matrix": [4, 11], "x": 65, "y": 0},
-                {"label": "K4C", "matrix": [4, 12], "x": 66, "y": 0},
-                {"label": "K4D", "matrix": [4, 13], "x": 67, "y": 0},
-                {"label": "K4E", "matrix": [4, 14], "x": 68, "y": 0}
+                {"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "K41", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "K46", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "K49", "matrix": [4, 9], "x": 10, "y": 4},
+                {"label": "K4A", "matrix": [4, 10], "x": 11, "y": 4},
+                {"label": "K4B", "matrix": [4, 11], "x": 12, "y": 4},
+                {"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_encoder": {

keyboards/tkw/stoutgat/v2/info.json

@@ -40,65 +40,65 @@
                 {"matrix": [0, 10], "x": 10, "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, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 1], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 9], "x": 62, "y": 0},
-                {"matrix": [4, 10], "x": 63, "y": 0},
-                {"matrix": [4, 11], "x": 64, "y": 0},
-                {"matrix": [4, 12], "x": 65, "y": 0},
-                {"matrix": [4, 13], "x": 66, "y": 0},
-                {"matrix": [4, 14], "x": 67, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker": {
@@ -116,64 +116,64 @@
                 {"matrix": [0, 10], "x": 10, "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, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [3, 12], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 1], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 9], "x": 62, "y": 0},
-                {"matrix": [4, 11], "x": 63, "y": 0},
-                {"matrix": [4, 12], "x": 64, "y": 0},
-                {"matrix": [4, 13], "x": 65, "y": 0},
-                {"matrix": [4, 14], "x": 66, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
@@ -191,66 +191,66 @@
                 {"matrix": [0, 10], "x": 10, "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, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 14], "x": 28, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [1, 13], "x": 42, "y": 0},
-                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 44, "y": 0},
-                {"matrix": [3, 1], "x": 45, "y": 0},
-                {"matrix": [3, 2], "x": 46, "y": 0},
-                {"matrix": [3, 3], "x": 47, "y": 0},
-                {"matrix": [3, 4], "x": 48, "y": 0},
-                {"matrix": [3, 5], "x": 49, "y": 0},
-                {"matrix": [3, 6], "x": 50, "y": 0},
-                {"matrix": [3, 7], "x": 51, "y": 0},
-                {"matrix": [3, 8], "x": 52, "y": 0},
-                {"matrix": [3, 9], "x": 53, "y": 0},
-                {"matrix": [3, 10], "x": 54, "y": 0},
-                {"matrix": [3, 11], "x": 55, "y": 0},
-                {"matrix": [3, 12], "x": 56, "y": 0},
-                {"matrix": [3, 13], "x": 57, "y": 0},
-                {"matrix": [3, 14], "x": 58, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w" :1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 59, "y": 0},
-                {"matrix": [4, 1], "x": 60, "y": 0},
-                {"matrix": [4, 2], "x": 61, "y": 0},
-                {"matrix": [4, 6], "x": 62, "y": 0},
-                {"matrix": [4, 9], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 12], "x": 66, "y": 0},
-                {"matrix": [4, 13], "x": 67, "y": 0},
-                {"matrix": [4, 14], "x": 68, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_encoder": {

keyboards/wilba_tech/wt80_a/info.json

@@ -15,8 +15,13 @@
     "diode_direction": "ROW2COL",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_tkl_ansi_split_bs_rshift",
+        "LAYOUT_no_split": "LAYOUT_tkl_ansi"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
@@ -122,108 +127,108 @@
                 {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
-        "LAYOUT_no_split": {
+        "LAYOUT_tkl_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"matrix": [0, 1], "x": 1, "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, 6], "x": 6, "y": 0},
-                {"matrix": [0, 7], "x": 7, "y": 0},
-                {"matrix": [0, 8], "x": 8, "y": 0},
-
-                {"matrix": [0, 9], "x": 9, "y": 0},
-                {"matrix": [0, 10], "x": 10, "y": 0},
-                {"matrix": [0, 11], "x": 11, "y": 0},
-                {"matrix": [0, 12], "x": 12, "y": 0},
-
-                {"matrix": [0, 14], "x": 13, "y": 0},
-                {"matrix": [0, 15], "x": 14, "y": 0},
-                {"matrix": [0, 16], "x": 15, "y": 0},
-
-                {"matrix": [1, 0], "x": 16, "y": 0},
-                {"matrix": [1, 1], "x": 17, "y": 0},
-                {"matrix": [1, 2], "x": 18, "y": 0},
-                {"matrix": [1, 3], "x": 19, "y": 0},
-                {"matrix": [1, 4], "x": 20, "y": 0},
-                {"matrix": [1, 5], "x": 21, "y": 0},
-                {"matrix": [1, 6], "x": 22, "y": 0},
-                {"matrix": [1, 7], "x": 23, "y": 0},
-                {"matrix": [1, 8], "x": 24, "y": 0},
-                {"matrix": [1, 9], "x": 25, "y": 0},
-                {"matrix": [1, 10], "x": 26, "y": 0},
-                {"matrix": [1, 11], "x": 27, "y": 0},
-                {"matrix": [1, 12], "x": 28, "y": 0},
-                {"matrix": [1, 13], "x": 29, "y": 0},
-
-                {"matrix": [1, 14], "x": 30, "y": 0},
-                {"matrix": [1, 15], "x": 31, "y": 0},
-                {"matrix": [1, 16], "x": 32, "y": 0},
-
-                {"matrix": [2, 0], "x": 33, "y": 0},
-                {"matrix": [2, 1], "x": 34, "y": 0},
-                {"matrix": [2, 2], "x": 35, "y": 0},
-                {"matrix": [2, 3], "x": 36, "y": 0},
-                {"matrix": [2, 4], "x": 37, "y": 0},
-                {"matrix": [2, 5], "x": 38, "y": 0},
-                {"matrix": [2, 6], "x": 39, "y": 0},
-                {"matrix": [2, 7], "x": 40, "y": 0},
-                {"matrix": [2, 8], "x": 41, "y": 0},
-                {"matrix": [2, 9], "x": 42, "y": 0},
-                {"matrix": [2, 10], "x": 43, "y": 0},
-                {"matrix": [2, 11], "x": 44, "y": 0},
-                {"matrix": [2, 12], "x": 45, "y": 0},
-                {"matrix": [2, 13], "x": 46, "y": 0},
-
-                {"matrix": [2, 14], "x": 47, "y": 0},
-                {"matrix": [2, 15], "x": 48, "y": 0},
-                {"matrix": [2, 16], "x": 49, "y": 0},
-
-                {"matrix": [3, 0], "x": 50, "y": 0},
-                {"matrix": [3, 1], "x": 51, "y": 0},
-                {"matrix": [3, 2], "x": 52, "y": 0},
-                {"matrix": [3, 3], "x": 53, "y": 0},
-                {"matrix": [3, 4], "x": 54, "y": 0},
-                {"matrix": [3, 5], "x": 55, "y": 0},
-                {"matrix": [3, 6], "x": 56, "y": 0},
-                {"matrix": [3, 7], "x": 57, "y": 0},
-                {"matrix": [3, 8], "x": 58, "y": 0},
-                {"matrix": [3, 9], "x": 59, "y": 0},
-                {"matrix": [3, 10], "x": 60, "y": 0},
-                {"matrix": [3, 11], "x": 61, "y": 0},
-                {"matrix": [3, 12], "x": 62, "y": 0},
-
-                {"matrix": [4, 0], "x": 63, "y": 0},
-                {"matrix": [4, 2], "x": 64, "y": 0},
-                {"matrix": [4, 3], "x": 65, "y": 0},
-                {"matrix": [4, 4], "x": 66, "y": 0},
-                {"matrix": [4, 5], "x": 67, "y": 0},
-                {"matrix": [4, 6], "x": 68, "y": 0},
-                {"matrix": [4, 7], "x": 69, "y": 0},
-                {"matrix": [4, 8], "x": 70, "y": 0},
-                {"matrix": [4, 9], "x": 71, "y": 0},
-                {"matrix": [4, 10], "x": 72, "y": 0},
-                {"matrix": [4, 11], "x": 73, "y": 0},
-                {"matrix": [4, 12], "x": 74, "y": 0},
-
-                {"matrix": [4, 15], "x": 75, "y": 0},
-
-                {"matrix": [5, 0], "x": 76, "y": 0},
-                {"matrix": [5, 1], "x": 77, "y": 0},
-                {"matrix": [5, 2], "x": 78, "y": 0},
-                {"matrix": [5, 6], "x": 79, "y": 0},
-                {"matrix": [5, 10], "x": 80, "y": 0},
-                {"matrix": [5, 11], "x": 81, "y": 0},
-                {"matrix": [5, 12], "x": 82, "y": 0},
-                {"matrix": [5, 13], "x": 83, "y": 0},
-
-                {"matrix": [5, 14], "x": 84, "y": 0},
-                {"matrix": [5, 15], "x": 85, "y": 0},
-                {"matrix": [5, 16], "x": 86, "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": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "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": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "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": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [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, "w": 2.25},
+
+                {"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, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+                {"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": [5, 16], "x": 17.25, "y": 5.5}
             ]
         }
     }

keyboards/xiudi/xd60/info.json

@@ -239,60 +239,64 @@
                 {"matrix": [0, 12], "x": 12, "y": 0},
                 {"matrix": [0, 13], "x": 13, "y": 0},
                 {"matrix": [4, 9], "x": 14, "y": 0},
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [2, 0], "x": 29, "y": 0},
-                {"matrix": [2, 1], "x": 30, "y": 0},
-                {"matrix": [2, 2], "x": 31, "y": 0},
-                {"matrix": [2, 3], "x": 32, "y": 0},
-                {"matrix": [2, 4], "x": 33, "y": 0},
-                {"matrix": [2, 5], "x": 34, "y": 0},
-                {"matrix": [2, 6], "x": 35, "y": 0},
-                {"matrix": [2, 7], "x": 36, "y": 0},
-                {"matrix": [2, 8], "x": 37, "y": 0},
-                {"matrix": [2, 9], "x": 38, "y": 0},
-                {"matrix": [2, 10], "x": 39, "y": 0},
-                {"matrix": [2, 11], "x": 40, "y": 0},
-                {"matrix": [2, 12], "x": 41, "y": 0},
-                {"matrix": [2, 13], "x": 42, "y": 0},
-                {"matrix": [3, 0], "x": 43, "y": 0},
-                {"matrix": [3, 1], "x": 44, "y": 0},
-                {"matrix": [3, 2], "x": 45, "y": 0},
-                {"matrix": [3, 3], "x": 46, "y": 0},
-                {"matrix": [3, 4], "x": 47, "y": 0},
-                {"matrix": [3, 5], "x": 48, "y": 0},
-                {"matrix": [3, 6], "x": 49, "y": 0},
-                {"matrix": [3, 7], "x": 50, "y": 0},
-                {"matrix": [3, 8], "x": 51, "y": 0},
-                {"matrix": [3, 9], "x": 52, "y": 0},
-                {"matrix": [3, 10], "x": 53, "y": 0},
-                {"matrix": [3, 11], "x": 54, "y": 0},
-                {"matrix": [4, 7], "x": 55, "y": 0},
-                {"matrix": [3, 13], "x": 56, "y": 0},
-                {"matrix": [3, 12], "x": 57, "y": 0},
-                {"matrix": [4, 0], "x": 58, "y": 0},
-                {"matrix": [4, 1], "x": 59, "y": 0},
-                {"matrix": [4, 2], "x": 60, "y": 0},
-                {"matrix": [4, 6], "x": 61, "y": 0},
-                {"matrix": [4, 5], "x": 62, "y": 0},
-                {"matrix": [4, 4], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 8], "x": 66, "y": 0},
-                {"matrix": [4, 12], "x": 67, "y": 0},
-                {"matrix": [4, 13], "x": 68, "y": 0}
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [4, 7], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 12], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 7.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         },
         "LAYOUT_60_iso": {

keyboards/xiudi/xd68/info.json

@@ -275,67 +275,67 @@
                 {"matrix": [0, 10], "x": 10, "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, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix": [1, 0], "x": 15, "y": 0},
-                {"matrix": [1, 1], "x": 16, "y": 0},
-                {"matrix": [1, 2], "x": 17, "y": 0},
-                {"matrix": [1, 3], "x": 18, "y": 0},
-                {"matrix": [1, 4], "x": 19, "y": 0},
-                {"matrix": [1, 5], "x": 20, "y": 0},
-                {"matrix": [1, 6], "x": 21, "y": 0},
-                {"matrix": [1, 7], "x": 22, "y": 0},
-                {"matrix": [1, 8], "x": 23, "y": 0},
-                {"matrix": [1, 9], "x": 24, "y": 0},
-                {"matrix": [1, 10], "x": 25, "y": 0},
-                {"matrix": [1, 11], "x": 26, "y": 0},
-                {"matrix": [1, 12], "x": 27, "y": 0},
-                {"matrix": [1, 13], "x": 28, "y": 0},
-                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 30, "y": 0},
-                {"matrix": [2, 1], "x": 31, "y": 0},
-                {"matrix": [2, 2], "x": 32, "y": 0},
-                {"matrix": [2, 3], "x": 33, "y": 0},
-                {"matrix": [2, 4], "x": 34, "y": 0},
-                {"matrix": [2, 5], "x": 35, "y": 0},
-                {"matrix": [2, 6], "x": 36, "y": 0},
-                {"matrix": [2, 7], "x": 37, "y": 0},
-                {"matrix": [2, 8], "x": 38, "y": 0},
-                {"matrix": [2, 9], "x": 39, "y": 0},
-                {"matrix": [2, 10], "x": 40, "y": 0},
-                {"matrix": [2, 11], "x": 41, "y": 0},
-                {"matrix": [2, 12], "x": 42, "y": 0},
-                {"matrix": [2, 13], "x": 43, "y": 0},
-                {"matrix": [2, 14], "x": 44, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix": [3, 0], "x": 45, "y": 0},
-                {"matrix": [3, 1], "x": 46, "y": 0},
-                {"matrix": [3, 2], "x": 47, "y": 0},
-                {"matrix": [3, 3], "x": 48, "y": 0},
-                {"matrix": [3, 4], "x": 49, "y": 0},
-                {"matrix": [3, 5], "x": 50, "y": 0},
-                {"matrix": [3, 6], "x": 51, "y": 0},
-                {"matrix": [3, 7], "x": 52, "y": 0},
-                {"matrix": [3, 8], "x": 53, "y": 0},
-                {"matrix": [3, 9], "x": 54, "y": 0},
-                {"matrix": [3, 10], "x": 55, "y": 0},
-                {"matrix": [3, 11], "x": 56, "y": 0},
-                {"matrix": [3, 12], "x": 57, "y": 0},
-                {"matrix": [3, 13], "x": 58, "y": 0},
-                {"matrix": [3, 14], "x": 59, "y": 0},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix": [4, 0], "x": 60, "y": 0},
-                {"matrix": [4, 1], "x": 61, "y": 0},
-                {"matrix": [4, 2], "x": 62, "y": 0},
-                {"matrix": [4, 5], "x": 63, "y": 0},
-                {"matrix": [4, 10], "x": 64, "y": 0},
-                {"matrix": [4, 11], "x": 65, "y": 0},
-                {"matrix": [4, 8], "x": 66, "y": 0},
-                {"matrix": [4, 12], "x": 67, "y": 0},
-                {"matrix": [4, 13], "x": 68, "y": 0},
-                {"matrix": [4, 14], "x": 69, "y": 0}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 8], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }