More `info.json` whitespace cleanups (#20665)

keyboards/0xcb/1337/info.json

@@ -36,15 +36,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/1k/info.json

@@ -19,7 +19,7 @@
   "layouts": {
     "LAYOUT_ortho_1x1": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]}
+        {"x": 0, "y": 0, "matrix": [0, 0]}
       ]
     }
   }

keyboards/25keys/cassette42/info.json

@@ -27,12 +27,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0, "matrix": [0, 4]},
-                {"x":2.5, "y":0, "matrix": [0, 5]},
-                {"x":0, "y":1, "matrix": [0, 0]},
-                {"x":1, "y":1, "matrix": [0, 1]},
-                {"x":2, "y":1, "matrix": [0, 2]},
-                {"x":3, "y":1, "matrix": [0, 3]}
+                {"x": 0.5, "y": 0, "matrix": [0, 4]},
+                {"x": 2.5, "y": 0, "matrix": [0, 5]},
+                {"x": 0, "y": 1, "matrix": [0, 0]},
+                {"x": 1, "y": 1, "matrix": [0, 1]},
+                {"x": 2, "y": 1, "matrix": [0, 2]},
+                {"x": 3, "y": 1, "matrix": [0, 3]}
             ]
         }
     }

keyboards/40percentclub/4pack/info.json

@@ -21,10 +21,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"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": 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]}
             ]
         }
     }

keyboards/40percentclub/4x4/info.json

@@ -19,190 +19,190 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"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": 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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
 
-                {"x":0, "y":3, "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": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]}
             ]
         },
         "LAYOUT_ortho_4x8": {
             "layout": [
-                {"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": 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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "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": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "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":0, "y":3, "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": 0, "y": 3, "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]}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"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": 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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
-                {"x":8, "y":1, "matrix": [1, 8]},
-                {"x":9, "y":1, "matrix": [1, 9]},
-                {"x":10, "y":1, "matrix": [1, 10]},
-                {"x":11, "y":1, "matrix": [1, 11]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "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":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": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "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": 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":0, "y":3, "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": 0, "y": 3, "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]}
             ]
         },
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"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": [0, 14]},
-                {"x":15, "y":0, "matrix": [0, 15]},
+                {"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": [0, 14]},
+                {"x": 15, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
-                {"x":8, "y":1, "matrix": [1, 8]},
-                {"x":9, "y":1, "matrix": [1, 9]},
-                {"x":10, "y":1, "matrix": [1, 10]},
-                {"x":11, "y":1, "matrix": [1, 11]},
-                {"x":12, "y":1, "matrix": [1, 12]},
-                {"x":13, "y":1, "matrix": [1, 13]},
-                {"x":14, "y":1, "matrix": [1, 14]},
-                {"x":15, "y":1, "matrix": [1, 15]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
+                {"x": 12, "y": 1, "matrix": [1, 12]},
+                {"x": 13, "y": 1, "matrix": [1, 13]},
+                {"x": 14, "y": 1, "matrix": [1, 14]},
+                {"x": 15, "y": 1, "matrix": [1, 15]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "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":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, 15]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "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": 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, 15]},
 
-                {"x":0, "y":3, "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": [3, 12]},
-                {"x":13, "y":3, "matrix": [3, 13]},
-                {"x":14, "y":3, "matrix": [3, 14]},
-                {"x":15, "y":3, "matrix": [3, 15]}
+                {"x": 0, "y": 3, "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": [3, 12]},
+                {"x": 13, "y": 3, "matrix": [3, 13]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
+                {"x": 15, "y": 3, "matrix": [3, 15]}
             ]
         }
     }

keyboards/40percentclub/nano/info.json

@@ -25,14 +25,14 @@
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"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":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]}
+        {"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": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }

keyboards/40percentclub/nein/info.json

@@ -20,15 +20,15 @@
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/40percentclub/sixpack/info.json

@@ -30,12 +30,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
           "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
           ]
         }
     }

keyboards/4pplet/unextended_std/rev_a/info.json

@@ -11,10 +11,8 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "matrix_pins": {
-        "rows":
-        ["B14", "B15", "B6", "B5", "B4"],
-        "cols":
-        ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
+        "rows": ["B14", "B15", "B6", "B5", "B4"],
+        "cols": ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
     },
     "diode_direction": "COL2ROW",
     "features": {
@@ -53,205 +51,205 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"|", "matrix": [1, 13], "x":13.5, "y":1},
-                {"label":"Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"nubs", "matrix": [3, 13], "x":12.75, "y":2},
-                {"label":"Enter", "matrix": [2, 13], "x":13.75, "y":2, "w":0.75},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":1.25},
-                {"label":"nubs", "matrix": [3, 1], "x":1.25, "y":3},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                 {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                 {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                 {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                 {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":1.25},
-                 {"label":"\u2191", "matrix": [4, 13], "x":13.5, "y":3},
-                 {"label":"Caps", "matrix": [4, 0], "x":0, "y":4},
-                 {"label":"opt", "matrix": [4, 1], "x":1, "y":4},
-                 {"label":"Cmd", "matrix": [4, 2], "x":2, "y":4, "w":1.75},
-                 {"label":"`", "matrix": [4, 3], "x":3.75, "y":4},
-                 {"label":"Space", "matrix": [4, 6], "x":4.75, "y":4, "w":4.75},
-                 {"label":"\\", "matrix": [4, 8], "x":9.5, "y":4},
-                 {"label":"\u2190", "matrix": [4, 9], "x":10.5, "y":4},
-                 {"label":"\u2192", "matrix": [4, 10], "x":11.5, "y":4},
-                 {"label":"\u2193", "matrix": [4, 11], "x":12.5, "y":4},
-                 {"label":"\u2191", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "nubs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 0.75},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                 {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                 {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                 {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                 {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                 {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                 {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                 {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                 {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                 {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                 {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                 {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                 {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                 {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                 {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                 {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         },
         "LAYOUT_m0116": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"Enter", "matrix": [2, 13], "x":13.5, "y":1, "h":2},
-                {"label":"Control", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.25},
-                {"label":"Caps", "matrix": [4, 0], "x":0, "y":4},
-                {"label":"opt", "matrix": [4, 1], "x":1, "y":4},
-                {"label":"Cmd", "matrix": [4, 2], "x":2, "y":4, "w":1.75},
-                {"label":"`", "matrix": [4, 3], "x":3.75, "y":4},
-                {"label":"Space", "matrix": [4, 6], "x":4.75, "y":4, "w":4.75},
-                {"label":"\\", "matrix": [4, 8], "x":9.5, "y":4},
-                {"label":"\u2190", "matrix": [4, 9], "x":10.5, "y":4},
-                {"label":"\u2192", "matrix": [4, 10], "x":11.5, "y":4},
-                {"label":"\u2193", "matrix": [4, 11], "x":12.5, "y":4},
-                {"label":"\u2191", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 1, "h": 2},
+                {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         },
         "LAYOUT_m0118": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"Enter", "matrix": [2, 13], "x":13.75, "y":1, "w":0.75, "h":2},
-                {"label":"Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"nuhs", "matrix": [3, 13], "x":12.75, "y":2},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":1.25},
-                {"label":"nubs", "matrix": [3, 1], "x":1.25, "y":3},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":1.25},
-                {"label":"\u2191", "matrix": [4, 13], "x":13.5, "y":3},
-                {"label":"Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25},
-                {"label":"Opt", "matrix": [4, 2], "x":1.25, "y":4, "w":1.5},
-                {"label":"Cmd", "matrix": [4, 3], "x":2.75, "y":4, "w":1.75},
-                {"label":"Space", "matrix": [4, 6], "x":4.5, "y":4, "w":5.25},
-                {"label":"Cmd", "matrix": [4, 9], "x":9.75, "y":4, "w":1.75},
-                {"label":"\u2190", "matrix": [4, 10], "x":11.5, "y":4},
-                {"label":"\u2192", "matrix": [4, 11], "x":12.5, "y":4},
-                {"label":"\u2193", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 0.75, "h": 2},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "nuhs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Opt", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Cmd", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 6], "x": 4.5, "y": 4, "w": 5.25},
+                {"label": "Cmd", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.75},
+                {"label": "\u2190", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         }
     }

keyboards/8pack/rev11/info.json

@@ -5,14 +5,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [1, 3]},
-                {"x":1, "y":0, "matrix": [1, 2]},
-                {"x":2, "y":0, "matrix": [1, 1]},
-                {"x":3, "y":0, "matrix": [1, 0]},
-                {"x":0, "y":1, "matrix": [0, 3]},
-                {"x":1, "y":1, "matrix": [0, 2]},
-                {"x":2, "y":1, "matrix": [0, 1]},
-                {"x":3, "y":1, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [1, 3]},
+                {"x": 1, "y": 0, "matrix": [1, 2]},
+                {"x": 2, "y": 0, "matrix": [1, 1]},
+                {"x": 3, "y": 0, "matrix": [1, 0]},
+                {"x": 0, "y": 1, "matrix": [0, 3]},
+                {"x": 1, "y": 1, "matrix": [0, 2]},
+                {"x": 2, "y": 1, "matrix": [0, 1]},
+                {"x": 3, "y": 1, "matrix": [0, 0]}
             ]
         }
     }

keyboards/8pack/rev12/info.json

@@ -5,14 +5,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"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":0, "y":1, "matrix": [1, 3]},
-                {"x":1, "y":1, "matrix": [1, 2]},
-                {"x":2, "y":1, "matrix": [1, 1]},
-                {"x":3, "y":1, "matrix": [1, 0]}
+                {"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": 0, "y": 1, "matrix": [1, 3]},
+                {"x": 1, "y": 1, "matrix": [1, 2]},
+                {"x": 2, "y": 1, "matrix": [1, 1]},
+                {"x": 3, "y": 1, "matrix": [1, 0]}
             ]
         }
     }

keyboards/adafruit/macropad/info.json

@@ -37,19 +37,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":0, "y":4, "matrix": [4, 0]},
-                {"x":1, "y":4, "matrix": [4, 1]},
-                {"x":2, "y":4, "matrix": [4, 2]}
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
             ]
         }
     }

keyboards/anavi/knobs3/info.json

@@ -53,9 +53,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label":"Mute", "x": 0, "y": 0, "matrix": [0, 0] },
-                { "label":"RGB", "x": 0, "y": 1, "matrix": [0, 1] },
-                { "label":"Animation", "x": 0, "y": 2, "matrix": [0, 2] }
+                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
+                {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
             ]
         }
     },

keyboards/anavi/macropad8/info.json

@@ -26,14 +26,14 @@
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"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":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]}
+        {"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": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }

keyboards/arrayperipherals/1x4p1/info.json

@@ -23,11 +23,11 @@
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [
-        {"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": 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]}
       ]
     }
   }

keyboards/atreus/info.json

@@ -10,7 +10,57 @@
   },
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.35}, {"x":2, "y":0}, {"x":3, "y":0.35}, {"x":4, "y":0.7}, {"x":8, "y":0.7}, {"x":9, "y":0.35}, {"x":10, "y":0}, {"x":11, "y":0.35}, {"x":12, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.35}, {"x":2, "y":1}, {"x":3, "y":1.35}, {"x":4, "y":1.7}, {"x":8, "y":1.7}, {"x":9, "y":1.35}, {"x":10, "y":1}, {"x":11, "y":1.35}, {"x":12, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.35}, {"x":2, "y":2}, {"x":3, "y":2.35}, {"x":4, "y":2.7}, {"x":8, "y":2.7}, {"x":9, "y":2.35}, {"x":10, "y":2}, {"x":11, "y":2.35}, {"x":12, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.35}, {"x":2, "y":3}, {"x":3, "y":3.35}, {"x":4, "y":3.7}, {"x":5, "y":2.95, "h":1.5}, {"x":7, "y":2.95, "h":1.5}, {"x":8, "y":3.7}, {"x":9, "y":3.35}, {"x":10, "y":3}, {"x":11, "y":3.35}, {"x":12, "y":3.6}]
+      "layout": [
+        {"x": 0, "y": 0.6},
+        {"x": 1, "y": 0.35},
+        {"x": 2, "y": 0},
+        {"x": 3, "y": 0.35},
+        {"x": 4, "y": 0.7},
+
+        {"x": 8, "y": 0.7},
+        {"x": 9, "y": 0.35},
+        {"x": 10, "y": 0},
+        {"x": 11, "y": 0.35},
+        {"x": 12, "y": 0.6},
+
+        {"x": 0, "y": 1.6},
+        {"x": 1, "y": 1.35},
+        {"x": 2, "y": 1},
+        {"x": 3, "y": 1.35},
+        {"x": 4, "y": 1.7},
+
+        {"x": 8, "y": 1.7},
+        {"x": 9, "y": 1.35},
+        {"x": 10, "y": 1},
+        {"x": 11, "y": 1.35},
+        {"x": 12, "y": 1.6},
+
+        {"x": 0, "y": 2.6},
+        {"x": 1, "y": 2.35},
+        {"x": 2, "y": 2},
+        {"x": 3, "y": 2.35},
+        {"x": 4, "y": 2.7},
+
+        {"x": 8, "y": 2.7},
+        {"x": 9, "y": 2.35},
+        {"x": 10, "y": 2},
+        {"x": 11, "y": 2.35},
+        {"x": 12, "y": 2.6},
+
+        {"x": 0, "y": 3.6},
+        {"x": 1, "y": 3.35},
+        {"x": 2, "y": 3},
+        {"x": 3, "y": 3.35},
+        {"x": 4, "y": 3.7},
+        {"x": 5, "y": 2.95, "h": 1.5},
+
+        {"x": 7, "y": 2.95, "h": 1.5},
+        {"x": 8, "y": 3.7},
+        {"x": 9, "y": 3.35},
+        {"x": 10, "y": 3},
+        {"x": 11, "y": 3.35},
+        {"x": 12, "y": 3.6}
+      ]
     }
   }
 }

keyboards/atset/at1/info.json

@@ -17,7 +17,7 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]}
+        {"x": 0, "y": 0, "matrix": [0, 0]}
       ]
     }
   }

keyboards/atset/at12/info.json

@@ -17,18 +17,18 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]},
-        {"x":0, "y":3, "matrix": [3, 0]},
-        {"x":1, "y":3, "matrix": [3, 1]},
-        {"x":2, "y":3, "matrix": [3, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]},
+        {"x": 0, "y": 3, "matrix": [3, 0]},
+        {"x": 1, "y": 3, "matrix": [3, 1]},
+        {"x": 2, "y": 3, "matrix": [3, 2]}
       ]
     }
   }

keyboards/atset/at16/info.json

@@ -18,22 +18,22 @@
   "layouts": {
     "LAYOUT_ortho_4x4": {
       "layout": [
-        {"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":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]},
-        {"x":3, "y":2, "matrix": [2, 3]},
-        {"x":0, "y":3, "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": 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": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]},
+        {"x": 3, "y": 2, "matrix": [2, 3]},
+        {"x": 0, "y": 3, "matrix": [3, 0]},
+        {"x": 1, "y": 3, "matrix": [3, 1]},
+        {"x": 2, "y": 3, "matrix": [3, 2]},
+        {"x": 3, "y": 3, "matrix": [3, 3]}
       ]
     }
   }

keyboards/atset/at3/info.json

@@ -17,9 +17,9 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]}
       ]
     }
   }

keyboards/atset/at6/info.json

@@ -17,12 +17,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }

keyboards/atset/at9/info.json

@@ -17,15 +17,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/boardsource/the_mark/info.json

@@ -45,418 +45,418 @@
   "rgb_matrix": {
     "driver": "WS2812",
     "layout": [
-      { "flags": 2, "x": 224, "y": 42},
-      { "flags": 2, "x": 224, "y": 21},
-      { "flags": 2, "x": 209, "y": 21},
-      { "flags": 2, "x": 179, "y": 21},
-      { "flags": 2, "x": 164, "y": 21},
-      { "flags": 2, "x": 134, "y": 21},
-      { "flags": 2, "x": 119, "y": 21},
-      { "flags": 2, "x": 89, "y": 21},
-      { "flags": 2, "x": 74, "y": 21},
-      { "flags": 2, "x": 45, "y": 21},
-      { "flags": 2, "x": 30, "y": 21},
-      { "flags": 2, "x": 30, "y": 42},
-      { "flags": 2, "x": 30, "y": 64},
-      { "flags": 2, "x": 30, "y": 85},
-      { "flags": 2, "x": 45, "y": 85},
-      { "flags": 2, "x": 74, "y": 85},
-      { "flags": 2, "x": 89, "y": 85},
-      { "flags": 2, "x": 119, "y": 85},
-      { "flags": 2, "x": 134, "y": 85},
-      { "flags": 2, "x": 164, "y": 85},
-      { "flags": 2, "x": 179, "y": 85},
-      { "flags": 2, "x": 209, "y": 85},
-      { "flags": 2, "x": 224, "y": 85},
-      { "flags": 2, "x": 224, "y": 64}
+      {"flags": 2, "x": 224, "y": 42},
+      {"flags": 2, "x": 224, "y": 21},
+      {"flags": 2, "x": 209, "y": 21},
+      {"flags": 2, "x": 179, "y": 21},
+      {"flags": 2, "x": 164, "y": 21},
+      {"flags": 2, "x": 134, "y": 21},
+      {"flags": 2, "x": 119, "y": 21},
+      {"flags": 2, "x": 89, "y": 21},
+      {"flags": 2, "x": 74, "y": 21},
+      {"flags": 2, "x": 45, "y": 21},
+      {"flags": 2, "x": 30, "y": 21},
+      {"flags": 2, "x": 30, "y": 42},
+      {"flags": 2, "x": 30, "y": 64},
+      {"flags": 2, "x": 30, "y": 85},
+      {"flags": 2, "x": 45, "y": 85},
+      {"flags": 2, "x": 74, "y": 85},
+      {"flags": 2, "x": 89, "y": 85},
+      {"flags": 2, "x": 119, "y": 85},
+      {"flags": 2, "x": 134, "y": 85},
+      {"flags": 2, "x": 164, "y": 85},
+      {"flags": 2, "x": 179, "y": 85},
+      {"flags": 2, "x": 209, "y": 85},
+      {"flags": 2, "x": 224, "y": 85},
+      {"flags": 2, "x": 224, "y": 64}
     ]
   },
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_ansi": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_ansi_split_bs_space": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_iso": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3\u00a3", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2\"", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'@", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "#~", "matrix": [1, 14], "x": 12.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_iso_split_bs_space": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3\u00a3", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2\"", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'@", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "#~", "matrix": [1, 14], "x": 12.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     }
   }

keyboards/bpiphany/pegasushoof/2013/info.json

@@ -2,7 +2,7 @@
     "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
     "diode_direction": "COL2ROW",
     "indicators": {
-        "caps_lock" : "C6",
+        "caps_lock": "C6",
         "scroll_lock": "C5",
         "on_state": 0
     },

keyboards/bpiphany/pegasushoof/2015/info.json

@@ -2,7 +2,7 @@
     "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
     "diode_direction": "COL2ROW",
     "indicators": {
-        "caps_lock" : "C6",
+        "caps_lock": "C6",
         "scroll_lock": "C5",
         "on_state": 0
     },

keyboards/bpiphany/sixshooter/info.json

@@ -19,12 +19,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }

keyboards/buildakb/potato65s/info.json

@@ -12,30 +12,8 @@
         "pin": "D5"
     },
     "matrix_pins": {
-        "cols": [
-            "D3",
-            "D4",
-            "D6",
-            "D7",
-            "B4",
-            "B5",
-            "B6",
-            "F1",
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "B7",
-            "D0",
-            "D1"
-        ],
-        "rows": [
-            "F5",
-            "F4",
-            "F6",
-            "F0",
-            "D2"
-        ]
+        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
+        "rows": ["F5", "F4", "F6", "F0", "D2"]
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
@@ -52,77 +30,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
@@ -203,151 +181,151 @@
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "Delete", "matrix": [2, 12], "x": 14, "y": 0 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }

keyboards/cannonkeys/db60/hotswap/info.json

@@ -7,214 +7,214 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"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, "w":2, "matrix": [0, 14]},
+                {"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, "w": 2, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"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, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 6]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"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, "matrix": [4, 14]}
             ]
         }
     }

keyboards/cannonkeys/db60/j02/info.json

@@ -7,284 +7,284 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"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, "w":2, "matrix": [0, 13]},
+                {"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, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"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, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 5]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 5]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"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, "w":2, "matrix": [0, 13]},
+                {"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, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":1, "w":1.25, "h":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"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":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"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": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"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, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"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, "matrix": [4, 14]}
             ]
         }
     }

keyboards/cannonkeys/db60/rev2/info.json

@@ -7,284 +7,284 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"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, "w":2, "matrix": [0, 13]},
+                {"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, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"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, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 6]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"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, "w":2, "matrix": [0, 13]},
+                {"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, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":1, "w":1.25, "h":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"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":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"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": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"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, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"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": [0, 14]},
+                {"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": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"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": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"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": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"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, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"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, "matrix": [4, 14]}
             ]
         }
     }

keyboards/cannonkeys/nearfield/info.json

@@ -1,12 +1,12 @@
 {
-    "keyboard_name":"Nearfield",
-    "manufacturer":"JLC",
-    "url":"",
-    "maintainer":"tominabox1",
-    "usb":{
-       "vid":"0x0004",
-       "pid":"0x0002",
-       "device_version":"0.0.1"
+    "keyboard_name": "Nearfield",
+    "manufacturer": "JLC",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+       "vid": "0x0004",
+       "pid": "0x0002",
+       "device_version": "0.0.1"
     },
     "matrix_pins": {
        "cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"],
@@ -107,80 +107,80 @@
         },
         "LAYOUT_3u_space": {
             "layout": [
-                { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "^", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "&", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "*", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "(", "matrix": [0, 9], "x": 10.5, "y": 0 },
-                { "label": ")", "matrix": [0, 10], "x": 11.5, "y": 0 },
-                { "label": "_", "matrix": [0, 11], "x": 12.5, "y": 0 },
-                { "label": "+", "matrix": [0, 12], "x": 13.5, "y": 0 },
-                { "label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0 },
-                { "label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0 },
-                { "label": "PgUp", "matrix": [0, 15], "x": 17.5, "y": 0 },
-
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5 },
-                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.5 },
-                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1.5 },
-                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.5 },
-                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.5 },
-                { "label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5 },
-                { "label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5 },
-                { "label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5 },
-                { "label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5 },
-                { "label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5 },
-                { "label": "{ ", "matrix": [1, 11], "x": 12.5, "y": 1.5 },
-                { "label": " }", "matrix": [1, 12], "x": 13.5, "y": 1.5 },
-                { "label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5 },
-                { "label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5 },
-                { "label": "PgUp", "matrix": [1, 15], "x": 17.5, "y": 1.5 },
-
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25 },
-                { "label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5 },
-                { "label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5 },
-                { "label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5 },
-                { "label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5 },
-                { "label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5 },
-                { "label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5 },
-                { "label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5 },
-                { "label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5 },
-                { "label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5 },
-                { "label": "\"", "matrix": [2, 10], "x": 11.75, "y": 2.5 },
-                { "label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75 },
-                { "label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5 },
-                { "label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5 },
-                { "label": "PgDn", "matrix": [2, 15], "x": 17.5, "y": 2.5 },
-
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5 },
-                { "label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
-                { "label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5 },
-                { "label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5 },
-                { "label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5 },
-                { "label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5 },
-                { "label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5 },
-                { "label": "<", "matrix": [3, 8], "x": 10.25, "y": 3.5 },
-                { "label": ">", "matrix": [3, 9], "x": 11.25, "y": 3.5 },
-                { "label": "?", "matrix": [3, 10], "x": 12.25, "y": 3.5 },
-                { "label": "r4 dogshift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25 },
-
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25 },
-                { "label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 3 },
-                { "label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25 },
-                { "label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25 },
-                { "label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5 },
-                { "label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5 },
-
-                { "label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5 },
-                { "label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5 },
-                { "label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5 }
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 10.5, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 11.5, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 12.5, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 13.5, "y": 0},
+                {"label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "PgUp", "matrix": [0, 15], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5},
+                {"label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5},
+                {"label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5},
+                {"label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5},
+                {"label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5},
+                {"label": "{", "matrix": [1, 11], "x": 12.5, "y": 1.5},
+                {"label": "}", "matrix": [1, 12], "x": 13.5, "y": 1.5},
+                {"label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.5, "y": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
+                {"label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5},
+                {"label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5},
+                {"label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5},
+                {"label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5},
+                {"label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5},
+                {"label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5},
+                {"label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5},
+                {"label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5},
+                {"label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5},
+                {"label": "\"", "matrix": [2, 10], "x": 11.75, "y": 2.5},
+                {"label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75},
+                {"label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5},
+                {"label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.5, "y": 2.5},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5},
+                {"label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5},
+                {"label": "<", "matrix": [3, 8], "x": 10.25, "y": 3.5},
+                {"label": ">", "matrix": [3, 9], "x": 11.25, "y": 3.5},
+                {"label": "?", "matrix": [3, 10], "x": 12.25, "y": 3.5},
+                {"label": "r4 dogshift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 3},
+                {"label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25},
+                {"label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5},
+                {"label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5},
+                {"label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5}
             ]
         }
     }

keyboards/cannonkeys/ortho48v2/info.json

@@ -42,54 +42,54 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back Space", "x":11, "y":0, "matrix": [0, 11]},
-                {"label":"Esc", "x":0, "y":1, "matrix": [1, 0]},
-                {"label":"A", "x":1, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9, "y":1, "matrix": [1, 9]},
-                {"label":";", "x":10, "y":1, "matrix": [1, 10]},
-                {"label":"'", "x":11, "y":1, "matrix": [1, 11]},
-                {"label":"Shift", "x":0, "y":2, "matrix": [2, 0]},
-                {"label":"Z", "x":1, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8, "y":2, "matrix": [2, 8]},
-                {"label":".", "x":9, "y":2, "matrix": [2, 9]},
-                {"label":"/", "x":10, "y":2, "matrix": [2, 10]},
-                {"label":"Return", "x":11, "y":2, "matrix": [2, 11]},
-                {"label":"", "x":0, "y":3, "matrix": [3, 0]},
-                {"label":"Ctrl", "x":1, "y":3, "matrix": [3, 1]},
-                {"label":"Alt", "x":2, "y":3, "matrix": [3, 2]},
-                {"label":"Super", "x":3, "y":3, "matrix": [3, 3]},
-                {"label":"⇓", "x":4, "y":3, "matrix": [3, 4]},
-                {"label":"", "x":5, "y":3, "matrix": [3, 5]},
-                {"label":"", "x":6, "y":3, "matrix": [3, 6]},
-                {"label":"⇑", "x":7, "y":3, "matrix": [3, 7]},
-                {"label":"←", "x":8, "y":3, "matrix": [3, 8]},
-                {"label":"↓", "x":9, "y":3, "matrix": [3, 9]},
-                {"label":"↑", "x":10, "y":3, "matrix": [3, 10]},
-                {"label":"→", "x":11, "y":3, "matrix": [3, 11]}]
+                {"label": "Tab", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back Space", "x": 11, "y": 0, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 1, "matrix": [1, 0]},
+                {"label": "A", "x": 1, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9, "y": 1, "matrix": [1, 9]},
+                {"label": ";", "x": 10, "y": 1, "matrix": [1, 10]},
+                {"label": "'", "x": 11, "y": 1, "matrix": [1, 11]},
+                {"label": "Shift", "x": 0, "y": 2, "matrix": [2, 0]},
+                {"label": "Z", "x": 1, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8, "y": 2, "matrix": [2, 8]},
+                {"label": ".", "x": 9, "y": 2, "matrix": [2, 9]},
+                {"label": "/", "x": 10, "y": 2, "matrix": [2, 10]},
+                {"label": "Return", "x": 11, "y": 2, "matrix": [2, 11]},
+                {"label": "", "x": 0, "y": 3, "matrix": [3, 0]},
+                {"label": "Ctrl", "x": 1, "y": 3, "matrix": [3, 1]},
+                {"label": "Alt", "x": 2, "y": 3, "matrix": [3, 2]},
+                {"label": "Super", "x": 3, "y": 3, "matrix": [3, 3]},
+                {"label": "⇓", "x": 4, "y": 3, "matrix": [3, 4]},
+                {"label": "", "x": 5, "y": 3, "matrix": [3, 5]},
+                {"label": "", "x": 6, "y": 3, "matrix": [3, 6]},
+                {"label": "⇑", "x": 7, "y": 3, "matrix": [3, 7]},
+                {"label": "←", "x": 8, "y": 3, "matrix": [3, 8]},
+                {"label": "↓", "x": 9, "y": 3, "matrix": [3, 9]},
+                {"label": "↑", "x": 10, "y": 3, "matrix": [3, 10]},
+                {"label": "→", "x": 11, "y": 3, "matrix": [3, 11]}]
         }
     }
 }

keyboards/capsunlocked/cu80/v1/info.json

@@ -125,7 +125,7 @@
                 {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
-        "LAYOUT_tkl_ansi":{
+        "LAYOUT_tkl_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 

keyboards/citrus/erdnuss65/info.json

@@ -10,10 +10,8 @@
         "device_version": "0.0.1"
     },
     "matrix_pins": {
-        "rows":
-        ["B10", "B1", "B0", "A7", "A6"],
-        "cols":
-        ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
+        "rows": ["B10", "B1", "B0", "A7", "A6"],
+        "cols": ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
     },
     "diode_direction": "COL2ROW",
     "features": {

keyboards/coban/pad3a/info.json

@@ -19,9 +19,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Next", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"Push", "x":3, "y":0, "matrix": [0, 2]},
+                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Next", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "Push", "x": 3, "y": 0, "matrix": [0, 2]},
             ]
         }
     }

keyboards/contra/info.json

@@ -25,111 +25,111 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
-        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
-        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
-        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
-        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
-        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
-        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
-        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
-        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
-        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
-        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
-        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+        {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0},
 
-        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
-        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
-        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
-        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
-        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
-        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
-        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
-        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
-        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
-        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
-        {"label":";", "matrix": [1, 10], "x":10, "y":1},
-        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+        {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1},
+        {"label": "A", "matrix": [1, 1], "x": 1, "y": 1},
+        {"label": "S", "matrix": [1, 2], "x": 2, "y": 1},
+        {"label": "D", "matrix": [1, 3], "x": 3, "y": 1},
+        {"label": "F", "matrix": [1, 4], "x": 4, "y": 1},
+        {"label": "G", "matrix": [1, 5], "x": 5, "y": 1},
+        {"label": "H", "matrix": [1, 6], "x": 6, "y": 1},
+        {"label": "J", "matrix": [1, 7], "x": 7, "y": 1},
+        {"label": "K", "matrix": [1, 8], "x": 8, "y": 1},
+        {"label": "L", "matrix": [1, 9], "x": 9, "y": 1},
+        {"label": ";", "matrix": [1, 10], "x": 10, "y": 1},
+        {"label": "'", "matrix": [1, 11], "x": 11, "y": 1},
 
-        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
-        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
-        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
-        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
-        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
-        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
-        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
-        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
-        {"label":",", "matrix": [2, 8], "x":8, "y":2},
-        {"label":".", "matrix": [2, 9], "x":9, "y":2},
-        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
-        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+        {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
+        {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
+        {"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
+        {"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
+        {"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
+        {"label": "N", "matrix": [2, 6], "x": 6, "y": 2},
+        {"label": "M", "matrix": [2, 7], "x": 7, "y": 2},
+        {"label": ",", "matrix": [2, 8], "x": 8, "y": 2},
+        {"label": ".", "matrix": [2, 9], "x": 9, "y": 2},
+        {"label": "/", "matrix": [2, 10], "x": 10, "y": 2},
+        {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2},
 
-        {"matrix": [3, 0], "x":0, "y":3},
-        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
-        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
-        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
-        {"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
-        {"matrix": [3, 5], "x":5, "y":3},
-        {"matrix": [3, 6], "x":6, "y":3},
-        {"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
-        {"label":"←", "matrix": [3, 8], "x":8, "y":3},
-        {"label":"↓", "matrix": [3, 9], "x":9, "y":3},
-        {"label":"↑", "matrix": [3, 10], "x":10, "y":3},
-        {"label":"→", "matrix": [3, 11], "x":11, "y":3}
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3},
+        {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3},
+        {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3},
+        {"label": "⇓", "matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"label": "⇑", "matrix": [3, 7], "x": 7, "y": 3},
+        {"label": "←", "matrix": [3, 8], "x": 8, "y": 3},
+        {"label": "↓", "matrix": [3, 9], "x": 9, "y": 3},
+        {"label": "↑", "matrix": [3, 10], "x": 10, "y": 3},
+        {"label": "→", "matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_mit": {
       "layout": [
-        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
-        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
-        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
-        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
-        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
-        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
-        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
-        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
-        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
-        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
-        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
-        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+        {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0},
 
-        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
-        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
-        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
-        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
-        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
-        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
-        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
-        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
-        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
-        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
-        {"label":";", "matrix": [1, 10], "x":10, "y":1},
-        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+        {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1},
+        {"label": "A", "matrix": [1, 1], "x": 1, "y": 1},
+        {"label": "S", "matrix": [1, 2], "x": 2, "y": 1},
+        {"label": "D", "matrix": [1, 3], "x": 3, "y": 1},
+        {"label": "F", "matrix": [1, 4], "x": 4, "y": 1},
+        {"label": "G", "matrix": [1, 5], "x": 5, "y": 1},
+        {"label": "H", "matrix": [1, 6], "x": 6, "y": 1},
+        {"label": "J", "matrix": [1, 7], "x": 7, "y": 1},
+        {"label": "K", "matrix": [1, 8], "x": 8, "y": 1},
+        {"label": "L", "matrix": [1, 9], "x": 9, "y": 1},
+        {"label": ";", "matrix": [1, 10], "x": 10, "y": 1},
+        {"label": "'", "matrix": [1, 11], "x": 11, "y": 1},
 
-        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
-        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
-        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
-        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
-        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
-        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
-        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
-        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
-        {"label":",", "matrix": [2, 8], "x":8, "y":2},
-        {"label":".", "matrix": [2, 9], "x":9, "y":2},
-        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
-        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+        {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
+        {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
+        {"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
+        {"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
+        {"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
+        {"label": "N", "matrix": [2, 6], "x": 6, "y": 2},
+        {"label": "M", "matrix": [2, 7], "x": 7, "y": 2},
+        {"label": ",", "matrix": [2, 8], "x": 8, "y": 2},
+        {"label": ".", "matrix": [2, 9], "x": 9, "y": 2},
+        {"label": "/", "matrix": [2, 10], "x": 10, "y": 2},
+        {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2},
 
-        {"matrix": [3, 0], "x":0, "y":3},
-        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
-        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
-        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
-        {"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
-        {"matrix": [3, 5], "x":5, "y":3},
-        {"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
-        {"label":"←", "matrix": [3, 8], "x":8, "y":3},
-        {"label":"↓", "matrix": [3, 9], "x":9, "y":3},
-        {"label":"↑", "matrix": [3, 10], "x":10, "y":3},
-        {"label":"→", "matrix": [3, 11], "x":11, "y":3}
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3},
+        {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3},
+        {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3},
+        {"label": "⇓", "matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"label": "⇑", "matrix": [3, 7], "x": 7, "y": 3},
+        {"label": "←", "matrix": [3, 8], "x": 8, "y": 3},
+        {"label": "↓", "matrix": [3, 9], "x": 9, "y": 3},
+        {"label": "↑", "matrix": [3, 10], "x": 10, "y": 3},
+        {"label": "→", "matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }

keyboards/controllerworks/mini36/info.json

@@ -13,7 +13,7 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "build": {
-        "lto":true
+        "lto": true
     },
     "matrix_pins": {
         "direct": [
@@ -57,96 +57,96 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            { "flags": 2, "x": 71, "y": 4 },
-            { "flags": 2, "x": 32, "y": 2 },
-            { "flags": 2, "x": 0, "y": 24 },
-            { "flags": 2, "x": 16, "y": 51 },
-            { "flags": 2, "x": 63, "y": 58 },
-            { "flags": 2, "x": 94, "y": 55 },
-            { "flags": 1, "matrix": [3, 2], "x": 90, "y": 64 },
-            { "flags": 4, "matrix": [2, 4], "x": 79, "y": 39 },
-            { "flags": 4, "matrix": [1, 4], "x": 79, "y": 22 },
-            { "flags": 4, "matrix": [0, 4], "x": 79, "y": 5 },
-            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 2 },
-            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 19 },
-            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 37 },
-            { "flags": 1, "matrix": [3, 1], "x": 74, "y": 58 },
-            { "flags": 1, "matrix": [3, 0], "x": 53, "y": 55 },
-            { "flags": 4, "matrix": [2, 2], "x": 43, "y": 34 },
-            { "flags": 4, "matrix": [1, 2], "x": 43, "y": 17 },
-            { "flags": 4, "matrix": [0, 2], "x": 43, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 25, "y": 2 },
-            { "flags": 4, "matrix": [1, 1], "x": 25, "y": 19 },
-            { "flags": 4, "matrix": [2, 1], "x": 25, "y": 37 },
-            { "flags": 4, "matrix": [2, 0], "x": 7, "y": 41 },
-            { "flags": 4, "matrix": [1, 0], "x": 7, "y": 24 },
-            { "flags": 4, "matrix": [0, 0], "x": 7, "y": 7 },
-            { "flags": 2, "x": 153, "y": 4 },
-            { "flags": 2, "x": 192, "y": 2 },
-            { "flags": 2, "x": 224, "y": 24 },
-            { "flags": 2, "x": 204, "y": 53 },
-            { "flags": 2, "x": 161, "y": 57 },
-            { "flags": 2, "x": 130, "y": 55 },
-            { "flags": 1, "matrix": [7, 0], "x": 134, "y": 64 },
-            { "flags": 4, "matrix": [6, 0], "x": 145, "y": 39 },
-            { "flags": 4, "matrix": [5, 0], "x": 145, "y": 22 },
-            { "flags": 4, "matrix": [4, 0], "x": 145, "y": 5 },
-            { "flags": 4, "matrix": [4, 1], "x": 163, "y": 2 },
-            { "flags": 4, "matrix": [5, 1], "x": 163, "y": 19 },
-            { "flags": 4, "matrix": [6, 1], "x": 163, "y": 37 },
-            { "flags": 1, "matrix": [7, 1], "x": 150, "y": 58 },
-            { "flags": 1, "matrix": [7, 2], "x": 171, "y": 55 },
-            { "flags": 4, "matrix": [6, 2], "x": 181, "y": 34 },
-            { "flags": 4, "matrix": [5, 2], "x": 181, "y": 17 },
-            { "flags": 4, "matrix": [4, 2], "x": 181, "y": 0 },
-            { "flags": 4, "matrix": [4, 3], "x": 199, "y": 2 },
-            { "flags": 4, "matrix": [5, 3], "x": 199, "y": 19 },
-            { "flags": 4, "matrix": [6, 3], "x": 199, "y": 37 },
-            { "flags": 4, "matrix": [6, 4], "x": 217, "y": 41 },
-            { "flags": 4, "matrix": [5, 4], "x": 217, "y": 24 },
-            { "flags": 4, "matrix": [4, 4], "x": 217, "y": 7 }
+            {"flags": 2, "x": 71, "y": 4},
+            {"flags": 2, "x": 32, "y": 2},
+            {"flags": 2, "x": 0, "y": 24},
+            {"flags": 2, "x": 16, "y": 51},
+            {"flags": 2, "x": 63, "y": 58},
+            {"flags": 2, "x": 94, "y": 55},
+            {"flags": 1, "matrix": [3, 2], "x": 90, "y": 64},
+            {"flags": 4, "matrix": [2, 4], "x": 79, "y": 39},
+            {"flags": 4, "matrix": [1, 4], "x": 79, "y": 22},
+            {"flags": 4, "matrix": [0, 4], "x": 79, "y": 5},
+            {"flags": 4, "matrix": [0, 3], "x": 61, "y": 2},
+            {"flags": 4, "matrix": [1, 3], "x": 61, "y": 19},
+            {"flags": 4, "matrix": [2, 3], "x": 61, "y": 37},
+            {"flags": 1, "matrix": [3, 1], "x": 74, "y": 58},
+            {"flags": 1, "matrix": [3, 0], "x": 53, "y": 55},
+            {"flags": 4, "matrix": [2, 2], "x": 43, "y": 34},
+            {"flags": 4, "matrix": [1, 2], "x": 43, "y": 17},
+            {"flags": 4, "matrix": [0, 2], "x": 43, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 25, "y": 2},
+            {"flags": 4, "matrix": [1, 1], "x": 25, "y": 19},
+            {"flags": 4, "matrix": [2, 1], "x": 25, "y": 37},
+            {"flags": 4, "matrix": [2, 0], "x": 7, "y": 41},
+            {"flags": 4, "matrix": [1, 0], "x": 7, "y": 24},
+            {"flags": 4, "matrix": [0, 0], "x": 7, "y": 7},
+            {"flags": 2, "x": 153, "y": 4},
+            {"flags": 2, "x": 192, "y": 2},
+            {"flags": 2, "x": 224, "y": 24},
+            {"flags": 2, "x": 204, "y": 53},
+            {"flags": 2, "x": 161, "y": 57},
+            {"flags": 2, "x": 130, "y": 55},
+            {"flags": 1, "matrix": [7, 0], "x": 134, "y": 64},
+            {"flags": 4, "matrix": [6, 0], "x": 145, "y": 39},
+            {"flags": 4, "matrix": [5, 0], "x": 145, "y": 22},
+            {"flags": 4, "matrix": [4, 0], "x": 145, "y": 5},
+            {"flags": 4, "matrix": [4, 1], "x": 163, "y": 2},
+            {"flags": 4, "matrix": [5, 1], "x": 163, "y": 19},
+            {"flags": 4, "matrix": [6, 1], "x": 163, "y": 37},
+            {"flags": 1, "matrix": [7, 1], "x": 150, "y": 58},
+            {"flags": 1, "matrix": [7, 2], "x": 171, "y": 55},
+            {"flags": 4, "matrix": [6, 2], "x": 181, "y": 34},
+            {"flags": 4, "matrix": [5, 2], "x": 181, "y": 17},
+            {"flags": 4, "matrix": [4, 2], "x": 181, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 199, "y": 2},
+            {"flags": 4, "matrix": [5, 3], "x": 199, "y": 19},
+            {"flags": 4, "matrix": [6, 3], "x": 199, "y": 37},
+            {"flags": 4, "matrix": [6, 4], "x": 217, "y": 41},
+            {"flags": 4, "matrix": [5, 4], "x": 217, "y": 24},
+            {"flags": 4, "matrix": [4, 4], "x": 217, "y": 7}
           ]
     },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0.25 },
-                { "matrix": [0, 1], "x": 1, "y": 0.125 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0.125 },
-                { "matrix": [0, 4], "x": 4, "y": 0.25 },
-                { "matrix": [4, 0], "x": 7, "y": 0.25 },
-                { "matrix": [4, 1], "x": 8, "y": 0.125 },
-                { "matrix": [4, 2], "x": 9, "y": 0 },
-                { "matrix": [4, 3], "x": 10, "y": 0.125 },
-                { "matrix": [4, 4], "x": 11, "y": 0.25 },
-                { "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1, "y": 1.125 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1.125 },
-                { "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "matrix": [5, 0], "x": 7, "y": 1.25 },
-                { "matrix": [5, 1], "x": 8, "y": 1.125 },
-                { "matrix": [5, 2], "x": 9, "y": 1 },
-                { "matrix": [5, 3], "x": 10, "y": 1.125 },
-                { "matrix": [5, 4], "x": 11, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1, "y": 2.125 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2.125 },
-                { "matrix": [2, 4], "x": 4, "y": 2.25 },
-                { "matrix": [6, 0], "x": 7, "y": 2.25 },
-                { "matrix": [6, 1], "x": 8, "y": 2.125 },
-                { "matrix": [6, 2], "x": 9, "y": 2 },
-                { "matrix": [6, 3], "x": 10, "y": 2.125 },
-                { "matrix": [6, 4], "x": 11, "y": 2.25 },
-                { "matrix": [3, 0], "x": 2.5, "y": 3.25 },
-                { "matrix": [3, 1], "x": 3.5, "y": 3.5 },
-                { "matrix": [3, 2], "x": 4.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 0], "x": 6.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 1], "x": 7.5, "y": 3.5 },
-                { "matrix": [7, 2], "x": 8.5, "y": 3.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [4, 0], "x": 7, "y": 0.25},
+                {"matrix": [4, 1], "x": 8, "y": 0.125},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.125},
+                {"matrix": [4, 4], "x": 11, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 0], "x": 7, "y": 1.25},
+                {"matrix": [5, 1], "x": 8, "y": 1.125},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.125},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [6, 0], "x": 7, "y": 2.25},
+                {"matrix": [6, 1], "x": 8, "y": 2.125},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.125},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [3, 0], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 0], "x": 6.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 8.5, "y": 3.25}
             ]
           }
     }

keyboards/controllerworks/mini42/info.json

@@ -13,7 +13,7 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "build": {
-        "lto":true
+        "lto": true
     },
     "matrix_pins": {
         "direct": [
@@ -59,108 +59,108 @@
         "driver": "WS2812",
         "split_count": [27, 27],
         "layout": [
-            { "flags": 2, "x": 75, "y": 4 },
-            { "flags": 2, "x": 40, "y": 2 },
-            { "flags": 2, "x": 8, "y": 8 },
-            { "flags": 2, "x": 8, "y": 43 },
-            { "flags": 2, "x": 49, "y": 51 },
-            { "flags": 2, "x": 95, "y": 55 },
-            { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 },
-            { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 },
-            { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 },
-            { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 },
-            { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 },
-            { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 },
-            { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 },
-            { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 },
-            { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 },
-            { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 },
-            { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 },
-            { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 },
-            { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 },
-            { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 },
-            { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 },
-            { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 },
-            { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 },
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 },
-            { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 },
-            { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 },
-            { "flags": 2, "x": 149, "y": 4 },
-            { "flags": 2, "x": 184, "y": 2 },
-            { "flags": 2, "x": 216, "y": 8 },
-            { "flags": 2, "x": 216, "y": 43 },
-            { "flags": 2, "x": 175, "y": 51 },
-            { "flags": 2, "x": 129, "y": 55 },
-            { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 },
-            { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 },
-            { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 },
-            { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 },
-            { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 },
-            { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 },
-            { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 },
-            { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 },
-            { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 },
-            { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 },
-            { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 },
-            { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 },
-            { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 },
-            { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 },
-            { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 },
-            { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 },
-            { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 },
-            { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 },
-            { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 },
-            { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 },
-            { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 }
+            {"flags": 2, "x": 75, "y": 4},
+            {"flags": 2, "x": 40, "y": 2},
+            {"flags": 2, "x": 8, "y": 8},
+            {"flags": 2, "x": 8, "y": 43},
+            {"flags": 2, "x": 49, "y": 51},
+            {"flags": 2, "x": 95, "y": 55},
+            {"flags": 1, "matrix": [3, 2], "x": 92, "y": 64},
+            {"flags": 4, "matrix": [2, 5], "x": 82, "y": 39},
+            {"flags": 4, "matrix": [1, 5], "x": 82, "y": 22},
+            {"flags": 4, "matrix": [0, 5], "x": 82, "y": 5},
+            {"flags": 4, "matrix": [0, 4], "x": 65, "y": 2},
+            {"flags": 4, "matrix": [1, 4], "x": 65, "y": 14},
+            {"flags": 4, "matrix": [2, 4], "x": 65, "y": 37},
+            {"flags": 1, "matrix": [3, 1], "x": 78, "y": 58},
+            {"flags": 1, "matrix": [3, 0], "x": 58, "y": 55},
+            {"flags": 4, "matrix": [2, 3], "x": 49, "y": 34},
+            {"flags": 4, "matrix": [1, 3], "x": 49, "y": 17},
+            {"flags": 4, "matrix": [0, 3], "x": 49, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 33, "y": 2},
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 19},
+            {"flags": 4, "matrix": [2, 2], "x": 33, "y": 37},
+            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 41},
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 24},
+            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 7},
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 7},
+            {"flags": 1, "matrix": [1, 0], "x": 17, "y": 24},
+            {"flags": 1, "matrix": [2, 0], "x": 34, "y": 41},
+            {"flags": 2, "x": 149, "y": 4},
+            {"flags": 2, "x": 184, "y": 2},
+            {"flags": 2, "x": 216, "y": 8},
+            {"flags": 2, "x": 216, "y": 43},
+            {"flags": 2, "x": 175, "y": 51},
+            {"flags": 2, "x": 129, "y": 55},
+            {"flags": 1, "matrix": [7, 0], "x": 132, "y": 64},
+            {"flags": 4, "matrix": [6, 0], "x": 142, "y": 39},
+            {"flags": 4, "matrix": [5, 0], "x": 142, "y": 22},
+            {"flags": 4, "matrix": [4, 0], "x": 142, "y": 5},
+            {"flags": 4, "matrix": [4, 1], "x": 159, "y": 2},
+            {"flags": 4, "matrix": [5, 1], "x": 159, "y": 19},
+            {"flags": 4, "matrix": [6, 1], "x": 159, "y": 37},
+            {"flags": 1, "matrix": [7, 1], "x": 146, "y": 58},
+            {"flags": 1, "matrix": [7, 2], "x": 166, "y": 55},
+            {"flags": 4, "matrix": [6, 2], "x": 175, "y": 34},
+            {"flags": 4, "matrix": [5, 2], "x": 175, "y": 17},
+            {"flags": 4, "matrix": [4, 2], "x": 175, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 191, "y": 2},
+            {"flags": 4, "matrix": [5, 3], "x": 191, "y": 19},
+            {"flags": 4, "matrix": [6, 3], "x": 191, "y": 37},
+            {"flags": 4, "matrix": [6, 4], "x": 208, "y": 41},
+            {"flags": 4, "matrix": [5, 4], "x": 208, "y": 24},
+            {"flags": 4, "matrix": [4, 4], "x": 208, "y": 7},
+            {"flags": 1, "matrix": [4, 5], "x": 224, "y": 7},
+            {"flags": 1, "matrix": [5, 5], "x": 224, "y": 24},
+            {"flags": 1, "matrix": [6, 5], "x": 224, "y": 41}
           ]
     },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0.25 },
-                { "matrix": [0, 1], "x": 1, "y": 0.25 },
-                { "matrix": [0, 2], "x": 2, "y": 0.125 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0.125 },
-                { "matrix": [0, 5], "x": 5, "y": 0.25 },
-                { "matrix": [4, 0], "x": 8, "y": 0.25 },
-                { "matrix": [4, 1], "x": 9, "y": 0.125 },
-                { "matrix": [4, 2], "x": 10, "y": 0 },
-                { "matrix": [4, 3], "x": 11, "y": 0.125 },
-                { "matrix": [4, 4], "x": 12, "y": 0.25 },
-                { "matrix": [4, 5], "x": 13, "y": 0.25 },
-                { "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2, "y": 1.125 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1.125 },
-                { "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "matrix": [5, 0], "x": 8, "y": 1.25 },
-                { "matrix": [5, 1], "x": 9, "y": 1.125 },
-                { "matrix": [5, 2], "x": 10, "y": 1 },
-                { "matrix": [5, 3], "x": 11, "y": 1.125 },
-                { "matrix": [5, 4], "x": 12, "y": 1.25 },
-                { "matrix": [5, 5], "x": 13, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2, "y": 2.125 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2.125 },
-                { "matrix": [2, 5], "x": 5, "y": 2.25 },
-                { "matrix": [6, 0], "x": 8, "y": 2.25 },
-                { "matrix": [6, 1], "x": 9, "y": 2.125 },
-                { "matrix": [6, 2], "x": 10, "y": 2 },
-                { "matrix": [6, 3], "x": 11, "y": 2.125 },
-                { "matrix": [6, 4], "x": 12, "y": 2.25 },
-                { "matrix": [6, 5], "x": 13, "y": 2.25 },
-                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
-                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
-                { "matrix": [3, 2], "x": 5.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 0], "x": 7.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
-                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 5.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
             ]
           }
     }

keyboards/crypt_macro/info.json

@@ -23,10 +23,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0.5, "y":1, "w":2, "matrix": [1, 1]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0.5, "y": 1, "w": 2, "matrix": [1, 1]}
             ]
         }
     }

keyboards/dailycraft/owl8/info.json

@@ -24,25 +24,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 12]},
-                {"x":1, "y":0, "matrix": [0, 13]},
-                {"x":2, "y":0, "matrix": [0, 14]},
-                {"x":3, "y":0, "matrix": [0, 15]},
+                {"x": 0, "y": 0, "matrix": [0, 12]},
+                {"x": 1, "y": 0, "matrix": [0, 13]},
+                {"x": 2, "y": 0, "matrix": [0, 14]},
+                {"x": 3, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1.25, "matrix": [0, 8]},
-                {"x":1, "y":1.25, "matrix": [0, 9]},
-                {"x":2, "y":1.25, "matrix": [0, 10]},
-                {"x":3, "y":1.25, "matrix": [0, 11]},
+                {"x": 0, "y": 1.25, "matrix": [0, 8]},
+                {"x": 1, "y": 1.25, "matrix": [0, 9]},
+                {"x": 2, "y": 1.25, "matrix": [0, 10]},
+                {"x": 3, "y": 1.25, "matrix": [0, 11]},
 
-                {"x":0, "y":2.5, "matrix": [0, 0]},
-                {"x":1, "y":2.5, "matrix": [0, 1]},
-                {"x":2, "y":2.5, "matrix": [0, 2]},
-                {"x":3, "y":2.5, "matrix": [0, 3]},
+                {"x": 0, "y": 2.5, "matrix": [0, 0]},
+                {"x": 1, "y": 2.5, "matrix": [0, 1]},
+                {"x": 2, "y": 2.5, "matrix": [0, 2]},
+                {"x": 3, "y": 2.5, "matrix": [0, 3]},
 
-                {"x":0, "y":3.5, "matrix": [0, 4]},
-                {"x":1, "y":3.5, "matrix": [0, 5]},
-                {"x":2, "y":3.5, "matrix": [0, 6]},
-                {"x":3, "y":3.5, "matrix": [0, 7]}
+                {"x": 0, "y": 3.5, "matrix": [0, 4]},
+                {"x": 1, "y": 3.5, "matrix": [0, 5]},
+                {"x": 2, "y": 3.5, "matrix": [0, 6]},
+                {"x": 3, "y": 3.5, "matrix": [0, 7]}
             ]
         }
     }

keyboards/doio/kb38/info.json

@@ -38,107 +38,107 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 4, "matrix": [0, 0], "x":0, "y":0},
-            {"flags": 4, "matrix": [0, 1], "x":62.2, "y":0},
-            {"flags": 4, "matrix": [0, 2], "x":99.6, "y":0},
-            {"flags": 4, "matrix": [0, 3], "x":124.4, "y":0},
-            {"flags": 4, "matrix": [0, 4], "x":149.3, "y":0},
-            {"flags": 4, "matrix": [0, 5], "x":174.2, "y":0},
-            {"flags": 4, "matrix": [0, 6], "x":199.1, "y":0},
-            {"flags": 4, "matrix": [0, 7], "x":224, "y":0},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
 
-            {"flags": 4, "matrix": [1, 0], "x":0, "y":12.8},
-            {"flags": 4, "matrix": [1, 1], "x":24.9, "y":12.8},
-            {"flags": 4, "matrix": [1, 2], "x":49.8, "y":12.8},
-            {"flags": 4, "matrix": [1, 3], "x":74.6, "y":12.8},
-            {"flags": 4, "matrix": [1, 4], "x":99.6, "y":12.8},
-            {"flags": 4, "matrix": [1, 5], "x":124.4, "y":12.8},
-            {"flags": 4, "matrix": [1, 6], "x":149.3, "y":12.8},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
+            {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
+            {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
+            {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
+            {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
 
-            {"flags": 4, "matrix": [2, 0], "x":0, "y":25.6},
-            {"flags": 4, "matrix": [2, 1], "x":24.9, "y":25.6},
-            {"flags": 4, "matrix": [2, 2], "x":49.8, "y":25.6},
-            {"flags": 4, "matrix": [2, 3], "x":74.6, "y":32},
-            {"flags": 4, "matrix": [2, 4], "x":90, "y":25.6},
-            {"flags": 4, "matrix": [2, 5], "x":124.4, "y":25.6},
-            {"flags": 4, "matrix": [2, 6], "x":149.3, "y":25.6},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
+            {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
+            {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
+            {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
+            {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
+            {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
 
-            {"flags": 4, "matrix": [3, 0], "x":0, "y":38.4},
-            {"flags": 4, "matrix": [3, 1], "x":24.9, "y":38.4},
-            {"flags": 4, "matrix": [3, 2], "x":49.8, "y":38.4},
-            {"flags": 4, "matrix": [3, 3], "x":99.6, "y":38.4},
-            {"flags": 4, "matrix": [3, 4], "x":124.4, "y":38.4},
-            {"flags": 4, "matrix": [3, 5], "x":149.3, "y":38.4},
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
+            {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
+            {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
+            {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
+            {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
+            {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
 
-            {"flags": 4, "matrix": [4, 0], "x":0, "y":51.2},
-            {"flags": 4, "matrix": [4, 1], "x":24.9, "y":51.2},
-            {"flags": 4, "matrix": [4, 2], "x":49.8, "y":51.2},
-            {"flags": 4, "matrix": [4, 3], "x":74.6, "y":57.6},
-            {"flags": 4, "matrix": [4, 5], "x":124.4, "y":51.2},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
+            {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
+            {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
+            {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
+            {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
 
-            {"flags": 4, "matrix": [5, 0], "x":12.5, "y":64},
-            {"flags": 4, "matrix": [5, 1], "x":49.8, "y":64},
-            {"flags": 4, "matrix": [5, 2], "x":99.6, "y":64},
-            {"flags": 4, "matrix": [5, 3], "x":124.4, "y":64},
-            {"flags": 4, "matrix": [5, 4], "x":149.3, "y":64},
+            {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
+            {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
+            {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
 
-            {"flags": 2, "x":224, "y":64},
-            {"flags": 2, "x":74.6, "y":64},
-            {"flags": 2, "x":0, "y":64},
-            {"flags": 2, "x":0, "y":0},
-            {"flags": 2, "x":74.6, "y":0},
-            {"flags": 2, "x":224, "y":0}
+            {"flags": 2, "x": 224, "y": 64},
+            {"flags": 2, "x": 74.6, "y": 64},
+            {"flags": 2, "x": 0, "y": 64},
+            {"flags": 2, "x": 0, "y": 0},
+            {"flags": 2, "x": 74.6, "y": 0},
+            {"flags": 2, "x": 224, "y": 0}
         ]
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"BSPC", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"RGB BACK", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"RGB OFF", "x":3, "y":0},
-                {"matrix": [0, 4], "label":"RGB FORW", "x":4, "y":0},
-                {"matrix": [0, 5], "label":"MAKE", "x":5, "y":0},
-                {"matrix": [0, 6], "label":"REBOOT", "x":6, "y":0},
-                {"matrix": [0, 7], "label":"BOOTLOAD", "x":7, "y":0},
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "BSPC", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "RGB BACK", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "RGB OFF", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "RGB FORW", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "MAKE", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "REBOOT", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "BOOTLOAD", "x": 7, "y": 0},
 
-                {"matrix": [1, 0], "label":"NUMLOCK", "x":0, "y":1},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1},
-                {"matrix": [1, 4], "label":"PAUS", "x":3, "y":1},
-                {"matrix": [1, 5], "label":"SCRL", "x":3, "y":1},
-                {"matrix": [1, 6], "label":"PSCR", "x":3, "y":1},
+                {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "PAUS", "x": 3, "y": 1},
+                {"matrix": [1, 5], "label": "SCRL", "x": 3, "y": 1},
+                {"matrix": [1, 6], "label": "PSCR", "x": 3, "y": 1},
 
-                {"matrix": [2, 0], "label":"7", "x":0, "y":2},
-                {"matrix": [2, 1], "label":"8", "x":1, "y":2},
-                {"matrix": [2, 2], "label":"9", "x":2, "y":2},
-                {"matrix": [2, 3], "label":"PPLS", "x":3, "y":2},
-                {"matrix": [2, 4], "label":"INS", "x":3, "y":2},
-                {"matrix": [2, 5], "label":"HOME", "x":3, "y":2},
-                {"matrix": [2, 6], "label":"PGUP", "x":3, "y":2},
+                {"matrix": [2, 0], "label": "7", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "8", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "9", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "INS", "x": 3, "y": 2},
+                {"matrix": [2, 5], "label": "HOME", "x": 3, "y": 2},
+                {"matrix": [2, 6], "label": "PGUP", "x": 3, "y": 2},
 
-                {"matrix": [3, 0], "label":"4", "x":0, "y":3},
-                {"matrix": [3, 1], "label":"5", "x":1, "y":3},
-                {"matrix": [3, 2], "label":"6", "x":2, "y":3},
-                {"matrix": [3, 3], "label":"END", "x":3, "y":3},
-                {"matrix": [3, 4], "label":"DEL", "x":3, "y":3},
-                {"matrix": [3, 5], "label":"PGDN", "x":3, "y":3},
+                {"matrix": [3, 0], "label": "4", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "5", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "6", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "END", "x": 3, "y": 3},
+                {"matrix": [3, 4], "label": "DEL", "x": 3, "y": 3},
+                {"matrix": [3, 5], "label": "PGDN", "x": 3, "y": 3},
 
-                {"matrix": [4, 0], "label":"1", "x":0, "y":4},
-                {"matrix": [4, 1], "label":"2", "x":1, "y":4},
-                {"matrix": [4, 2], "label":"3", "x":2, "y":4},
-                {"matrix": [4, 3], "label":"PENT", "x":3, "y":4},
-                {"matrix": [4, 5], "label":"UP", "x":3, "y":4},
+                {"matrix": [4, 0], "label": "1", "x": 0, "y": 4},
+                {"matrix": [4, 1], "label": "2", "x": 1, "y": 4},
+                {"matrix": [4, 2], "label": "3", "x": 2, "y": 4},
+                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4},
+                {"matrix": [4, 5], "label": "UP", "x": 3, "y": 4},
 
-                {"matrix": [5, 0], "label":"0", "x":0, "y":5},
-                {"matrix": [5, 1], "label":"PDOT", "x":1, "y":5},
-                {"matrix": [5, 2], "label":"LEFT", "x":2, "y":5},
-                {"matrix": [5, 3], "label":"DOWN", "x":3, "y":5},
-                {"matrix": [5, 4], "label":"RIGHT", "x":4, "y":5},
-                {"matrix": [5, 5], "label":"KNOB_L", "x":3, "y":5},
-                {"matrix": [5, 6], "label":"KNOB_R", "x":3, "y":5},
-                {"matrix": [5, 7], "label":"KNOB_D", "x":3, "y":5}
+                {"matrix": [5, 0], "label": "0", "x": 0, "y": 5},
+                {"matrix": [5, 1], "label": "PDOT", "x": 1, "y": 5},
+                {"matrix": [5, 2], "label": "LEFT", "x": 2, "y": 5},
+                {"matrix": [5, 3], "label": "DOWN", "x": 3, "y": 5},
+                {"matrix": [5, 4], "label": "RIGHT", "x": 4, "y": 5},
+                {"matrix": [5, 5], "label": "KNOB_L", "x": 3, "y": 5},
+                {"matrix": [5, 6], "label": "KNOB_R", "x": 3, "y": 5},
+                {"matrix": [5, 7], "label": "KNOB_D", "x": 3, "y": 5}
             ]
         }
     }

keyboards/drop/sense75/info.json

@@ -27,205 +27,205 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"Esc", "x":0, "y":0},
-                { "matrix": [0, 1], "label":"F1", "x":1.25, "y":0},
-                { "matrix": [0, 2], "label":"F2", "x":2.25, "y":0},
-                { "matrix": [0, 3], "label":"F3", "x":3.25, "y":0},
-                { "matrix": [0, 4], "label":"F4", "x":4.25, "y":0},
-                { "matrix": [0, 5], "label":"F5", "x":5.5, "y":0},
-                { "matrix": [0, 6], "label":"F6", "x":6.5, "y":0},
-                { "matrix": [0, 7], "label":"F7", "x":7.5, "y":0},
-                { "matrix": [0, 8], "label":"F8", "x":8.5, "y":0},
-                { "matrix": [0, 9], "label":"F9", "x":9.75, "y":0},
-                { "matrix": [0, 10], "label":"F10", "x":10.75, "y":0},
-                { "matrix": [0, 11], "label":"F11", "x":11.75, "y":0},
-                { "matrix": [0, 12], "label":"F12", "x":12.75, "y":0},
-                { "matrix": [0, 13], "label":"PrtSc", "x":14, "y":0},
-                { "matrix": [0, 14], "label":"Mute", "x":15.25, "y":0},
-                { "matrix": [1, 0], "label":"~", "x":0, "y":1.25},
-                { "matrix": [1, 1], "label":"!", "x":1, "y":1.25},
-                { "matrix": [1, 2], "label":"@", "x":2, "y":1.25},
-                { "matrix": [1, 3], "label":"#", "x":3, "y":1.25},
-                { "matrix": [1, 4], "label":"$", "x":4, "y":1.25},
-                { "matrix": [1, 5], "label":"%", "x":5, "y":1.25},
-                { "matrix": [1, 6], "label":"^", "x":6, "y":1.25},
-                { "matrix": [1, 7], "label":"&", "x":7, "y":1.25},
-                { "matrix": [1, 8], "label":"*", "x":8, "y":1.25},
-                { "matrix": [1, 9], "label":"(", "x":9, "y":1.25},
-                { "matrix": [1, 10], "label":")", "x":10, "y":1.25},
-                { "matrix": [1, 11], "label":"_", "x":11, "y":1.25},
-                { "matrix": [1, 12], "label":"+", "x":12, "y":1.25},
-                { "matrix": [1, 13], "label":"Backspace", "x":13, "y":1.25, "w":2},
-                { "matrix": [1, 14], "label":"Del", "x":15.25, "y":1.25},
-                { "matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
-                { "matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25},
-                { "matrix": [2, 2], "label":"W", "x":2.5, "y":2.25},
-                { "matrix": [2, 3], "label":"E", "x":3.5, "y":2.25},
-                { "matrix": [2, 4], "label":"R", "x":4.5, "y":2.25},
-                { "matrix": [2, 5], "label":"T", "x":5.5, "y":2.25},
-                { "matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25},
-                { "matrix": [2, 7], "label":"U", "x":7.5, "y":2.25},
-                { "matrix": [2, 8], "label":"I", "x":8.5, "y":2.25},
-                { "matrix": [2, 9], "label":"O", "x":9.5, "y":2.25},
-                { "matrix": [2, 10], "label":"P", "x":10.5, "y":2.25},
-                { "matrix": [2, 11], "label":"{", "x":11.5, "y":2.25},
-                { "matrix": [2, 12], "label":"}", "x":12.5, "y":2.25},
-                { "matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
-                { "matrix": [2, 14], "label":"Page Up", "x":15.25, "y":2.25},
-                { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                { "matrix": [3, 1], "label":"A", "x":1.75, "y":3.25},
-                { "matrix": [3, 2], "label":"S", "x":2.75, "y":3.25},
-                { "matrix": [3, 3], "label":"D", "x":3.75, "y":3.25},
-                { "matrix": [3, 4], "label":"F", "x":4.75, "y":3.25},
-                { "matrix": [3, 5], "label":"G", "x":5.75, "y":3.25},
-                { "matrix": [3, 6], "label":"H", "x":6.75, "y":3.25},
-                { "matrix": [3, 7], "label":"J", "x":7.75, "y":3.25},
-                { "matrix": [3, 8], "label":"K", "x":8.75, "y":3.25},
-                { "matrix": [3, 9], "label":"L", "x":9.75, "y":3.25},
-                { "matrix": [3, 10], "label":":", "x":10.75, "y":3.25},
-                { "matrix": [3, 11], "label":"\"", "x":11.75, "y":3.25},
-                { "matrix": [3, 12], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                { "matrix": [3, 14], "label":"Page Down", "x":15.25, "y":3.25},
-                { "matrix": [4, 0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
-                { "matrix": [4, 1], "label":"Z", "x":2.25, "y":4.25},
-                { "matrix": [4, 2], "label":"X", "x":3.25, "y":4.25},
-                { "matrix": [4, 3], "label":"C", "x":4.25, "y":4.25},
-                { "matrix": [4, 4], "label":"V", "x":5.25, "y":4.25},
-                { "matrix": [4, 5], "label":"B", "x":6.25, "y":4.25},
-                { "matrix": [4, 6], "label":"N", "x":7.25, "y":4.25},
-                { "matrix": [4, 7], "label":"M", "x":8.25, "y":4.25},
-                { "matrix": [4, 8], "label":"<", "x":9.25, "y":4.25},
-                { "matrix": [4, 9], "label":">", "x":10.25, "y":4.25},
-                { "matrix": [4, 10], "label":"?", "x":11.25, "y":4.25},
-                { "matrix": [4, 11], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                { "matrix": [4, 13], "label":"\u2191", "x":14.25, "y":4.5},
-                { "matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                { "matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                { "matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                { "matrix": [5, 5], "label":" ", "x":3.75, "y":5.25, "w":6.25},
-                { "matrix": [5, 8], "label":"Alt", "x":10, "y":5.25},
-                { "matrix": [5, 9], "label":"Fn", "x":11, "y":5.25},
-                { "matrix": [5, 10], "label":"Ctrl", "x":12, "y":5.25},
-                { "matrix": [5, 12], "label":"\u2190", "x":13.25, "y":5.5},
-                { "matrix": [5, 13], "label":"\u2193", "x":14.25, "y":5.5},
-                { "matrix": [5, 14], "label":"\u2192", "x":15.25, "y":5.5}
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "PrtSc", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "Mute", "x": 15.25, "y": 0},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "label": "Del", "x": 15.25, "y": 1.25},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Page Up", "x": 15.25, "y": 2.25},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "\"", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "label": "Page Down", "x": 15.25, "y": 3.25},
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "\u2191", "x": 14.25, "y": 4.5},
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "label": " ", "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "label": "Alt", "x": 10, "y": 5.25},
+                {"matrix": [5, 9], "label": "Fn", "x": 11, "y": 5.25},
+                {"matrix": [5, 10], "label": "Ctrl", "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "label": "\u2190", "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "label": "\u2193", "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "label": "\u2192", "x": 15.25, "y": 5.5}
             ]
         }
     },
     "rgb_matrix": {
         "driver": "IS31FL3733",
         "layout": [
-            { "flags": 2, "x": 2, "y": 0 },
-            { "flags": 2, "x": 22, "y": 0 },
-            { "flags": 2, "x": 42, "y": 0 },
-            { "flags": 2, "x": 62, "y": 0 },
-            { "flags": 2, "x": 82, "y": 0 },
-            { "flags": 2, "x": 102, "y": 0 },
-            { "flags": 2, "x": 122, "y": 0 },
-            { "flags": 2, "x": 142, "y": 0 },
-            { "flags": 2, "x": 162, "y": 0 },
-            { "flags": 2, "x": 182, "y": 0 },
-            { "flags": 2, "x": 202, "y": 0 },
-            { "flags": 2, "x": 222, "y": 0 },
-            { "flags": 2, "x": 0, "y": 7 },
-            { "flags": 4, "matrix": [0, 0], "x": 6, "y": 8 },
-            { "flags": 4, "matrix": [0, 1], "x": 24, "y": 8 },
-            { "flags": 4, "matrix": [0, 2], "x": 37, "y": 8 },
-            { "flags": 4, "matrix": [0, 3], "x": 51, "y": 8 },
-            { "flags": 4, "matrix": [0, 4], "x": 66, "y": 8 },
-            { "flags": 4, "matrix": [0, 5], "x": 82, "y": 8 },
-            { "flags": 4, "matrix": [0, 6], "x": 96, "y": 8 },
-            { "flags": 4, "matrix": [0, 7], "x": 110, "y": 8 },
-            { "flags": 4, "matrix": [0, 8], "x": 124, "y": 8 },
-            { "flags": 4, "matrix": [0, 9], "x": 141, "y": 8 },
-            { "flags": 4, "matrix": [0, 10], "x": 155, "y": 8 },
-            { "flags": 4, "matrix": [0, 11], "x": 169, "y": 8 },
-            { "flags": 4, "matrix": [0, 12], "x": 182, "y": 8 },
-            { "flags": 4, "matrix": [0, 13], "x": 199, "y": 8 },
-            { "flags": 2, "x": 224, "y": 4 },
-            { "flags": 2, "x": 0, "y": 12 },
-            { "flags": 4, "matrix": [1, 0], "x": 6, "y": 20 },
-            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 20 },
-            { "flags": 4, "matrix": [1, 2], "x": 34, "y": 20 },
-            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 20 },
-            { "flags": 4, "matrix": [1, 4], "x": 62, "y": 20 },
-            { "flags": 4, "matrix": [1, 5], "x": 75, "y": 20 },
-            { "flags": 4, "matrix": [1, 6], "x": 90, "y": 20 },
-            { "flags": 4, "matrix": [1, 7], "x": 103, "y": 20 },
-            { "flags": 4, "matrix": [1, 8], "x": 117, "y": 20 },
-            { "flags": 4, "matrix": [1, 9], "x": 130, "y": 20 },
-            { "flags": 4, "matrix": [1, 10], "x": 144, "y": 20 },
-            { "flags": 4, "matrix": [1, 11], "x": 158, "y": 20 },
-            { "flags": 4, "matrix": [1, 12], "x": 170, "y": 20 },
-            { "flags": 4, "matrix": [1, 13], "x": 192, "y": 20 },
-            { "flags": 4, "matrix": [1, 14], "x": 217, "y": 20 },
-            { "flags": 2, "x": 224, "y": 12 },
-            { "flags": 2, "x": 0, "y": 22 },
-            { "flags": 4, "matrix": [2, 0], "x": 10, "y": 30 },
-            { "flags": 4, "matrix": [2, 1], "x": 27, "y": 30 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 30 },
-            { "flags": 4, "matrix": [2, 3], "x": 54, "y": 30 },
-            { "flags": 4, "matrix": [2, 4], "x": 69, "y": 30 },
-            { "flags": 4, "matrix": [2, 5], "x": 82, "y": 30 },
-            { "flags": 4, "matrix": [2, 6], "x": 96, "y": 30 },
-            { "flags": 4, "matrix": [2, 7], "x": 110, "y": 30 },
-            { "flags": 4, "matrix": [2, 8], "x": 123, "y": 30 },
-            { "flags": 4, "matrix": [2, 9], "x": 138, "y": 30 },
-            { "flags": 4, "matrix": [2, 10], "x": 151, "y": 30 },
-            { "flags": 4, "matrix": [2, 11], "x": 165, "y": 30 },
-            { "flags": 4, "matrix": [2, 12], "x": 179, "y": 30 },
-            { "flags": 4, "matrix": [2, 13], "x": 196, "y": 30 },
-            { "flags": 4, "matrix": [2, 14], "x": 217, "y": 30 },
-            { "flags": 2, "x": 224, "y": 22 },
-            { "flags": 4, "matrix": [3, 0], "x": 11, "y": 40 },
-            { "flags": 4, "matrix": [3, 1], "x": 30, "y": 40 },
-            { "flags": 4, "matrix": [3, 2], "x": 44, "y": 40 },
-            { "flags": 4, "matrix": [3, 3], "x": 57, "y": 40 },
-            { "flags": 4, "matrix": [3, 4], "x": 72, "y": 40 },
-            { "flags": 4, "matrix": [3, 5], "x": 85, "y": 40 },
-            { "flags": 4, "matrix": [3, 6], "x": 99, "y": 40 },
-            { "flags": 4, "matrix": [3, 7], "x": 113, "y": 40 },
-            { "flags": 4, "matrix": [3, 8], "x": 126, "y": 40 },
-            { "flags": 4, "matrix": [3, 9], "x": 140, "y": 40 },
-            { "flags": 4, "matrix": [3, 10], "x": 154, "y": 40 },
-            { "flags": 4, "matrix": [3, 11], "x": 169, "y": 40 },
-            { "flags": 4, "matrix": [3, 12], "x": 190, "y": 40 },
-            { "flags": 4, "matrix": [3, 14], "x": 217, "y": 40 },
-            { "flags": 2, "x": 0, "y": 42 },
-            { "flags": 4, "matrix": [4, 0], "x": 15, "y": 50 },
-            { "flags": 4, "matrix": [4, 1], "x": 37, "y": 50 },
-            { "flags": 4, "matrix": [4, 2], "x": 51, "y": 50 },
-            { "flags": 4, "matrix": [4, 3], "x": 66, "y": 50 },
-            { "flags": 4, "matrix": [4, 4], "x": 79, "y": 50 },
-            { "flags": 4, "matrix": [4, 5], "x": 93, "y": 50 },
-            { "flags": 4, "matrix": [4, 6], "x": 107, "y": 50 },
-            { "flags": 4, "matrix": [4, 7], "x": 120, "y": 50 },
-            { "flags": 4, "matrix": [4, 8], "x": 134, "y": 50 },
-            { "flags": 4, "matrix": [4, 9], "x": 148, "y": 50 },
-            { "flags": 4, "matrix": [4, 10], "x": 161, "y": 50 },
-            { "flags": 4, "matrix": [4, 11], "x": 180, "y": 50 },
-            { "flags": 4, "matrix": [4, 13], "x": 202, "y": 53 },
-            { "flags": 2, "x": 224, "y": 42 },
-            { "flags": 2, "x": 0, "y": 51 },
-            { "flags": 4, "matrix": [5, 0], "x": 8, "y": 60 },
-            { "flags": 4, "matrix": [5, 1], "x": 26, "y": 60 },
-            { "flags": 4, "matrix": [5, 2], "x": 42, "y": 60 },
-            { "flags": 4, "matrix": [5, 5], "x": 94, "y": 60 },
-            { "flags": 4, "matrix": [5, 8], "x": 144, "y": 60 },
-            { "flags": 4, "matrix": [5, 9], "x": 158, "y": 60 },
-            { "flags": 4, "matrix": [5, 10], "x": 172, "y": 60 },
-            { "flags": 4, "matrix": [5, 12], "x": 189, "y": 63 },
-            { "flags": 4, "matrix": [5, 13], "x": 202, "y": 63 },
-            { "flags": 4, "matrix": [5, 14], "x": 217, "y": 63 },
-            { "flags": 2, "x": 224, "y": 51 },
-            { "flags": 2, "x": 9, "y": 64 },
-            { "flags": 2, "x": 38, "y": 64 },
-            { "flags": 2, "x": 69, "y": 64 },
-            { "flags": 2, "x": 96, "y": 64 },
-            { "flags": 2, "x": 125, "y": 64 },
-            { "flags": 2, "x": 154, "y": 64 },
-            { "flags": 2, "x": 182, "y": 64 },
-            { "flags": 2, "x": 211, "y": 64 }
+            {"flags": 2, "x": 2, "y": 0},
+            {"flags": 2, "x": 22, "y": 0},
+            {"flags": 2, "x": 42, "y": 0},
+            {"flags": 2, "x": 62, "y": 0},
+            {"flags": 2, "x": 82, "y": 0},
+            {"flags": 2, "x": 102, "y": 0},
+            {"flags": 2, "x": 122, "y": 0},
+            {"flags": 2, "x": 142, "y": 0},
+            {"flags": 2, "x": 162, "y": 0},
+            {"flags": 2, "x": 182, "y": 0},
+            {"flags": 2, "x": 202, "y": 0},
+            {"flags": 2, "x": 222, "y": 0},
+            {"flags": 2, "x": 0, "y": 7},
+            {"flags": 4, "matrix": [0, 0], "x": 6, "y": 8},
+            {"flags": 4, "matrix": [0, 1], "x": 24, "y": 8},
+            {"flags": 4, "matrix": [0, 2], "x": 37, "y": 8},
+            {"flags": 4, "matrix": [0, 3], "x": 51, "y": 8},
+            {"flags": 4, "matrix": [0, 4], "x": 66, "y": 8},
+            {"flags": 4, "matrix": [0, 5], "x": 82, "y": 8},
+            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 8},
+            {"flags": 4, "matrix": [0, 7], "x": 110, "y": 8},
+            {"flags": 4, "matrix": [0, 8], "x": 124, "y": 8},
+            {"flags": 4, "matrix": [0, 9], "x": 141, "y": 8},
+            {"flags": 4, "matrix": [0, 10], "x": 155, "y": 8},
+            {"flags": 4, "matrix": [0, 11], "x": 169, "y": 8},
+            {"flags": 4, "matrix": [0, 12], "x": 182, "y": 8},
+            {"flags": 4, "matrix": [0, 13], "x": 199, "y": 8},
+            {"flags": 2, "x": 224, "y": 4},
+            {"flags": 2, "x": 0, "y": 12},
+            {"flags": 4, "matrix": [1, 0], "x": 6, "y": 20},
+            {"flags": 4, "matrix": [1, 1], "x": 20, "y": 20},
+            {"flags": 4, "matrix": [1, 2], "x": 34, "y": 20},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 20},
+            {"flags": 4, "matrix": [1, 4], "x": 62, "y": 20},
+            {"flags": 4, "matrix": [1, 5], "x": 75, "y": 20},
+            {"flags": 4, "matrix": [1, 6], "x": 90, "y": 20},
+            {"flags": 4, "matrix": [1, 7], "x": 103, "y": 20},
+            {"flags": 4, "matrix": [1, 8], "x": 117, "y": 20},
+            {"flags": 4, "matrix": [1, 9], "x": 130, "y": 20},
+            {"flags": 4, "matrix": [1, 10], "x": 144, "y": 20},
+            {"flags": 4, "matrix": [1, 11], "x": 158, "y": 20},
+            {"flags": 4, "matrix": [1, 12], "x": 170, "y": 20},
+            {"flags": 4, "matrix": [1, 13], "x": 192, "y": 20},
+            {"flags": 4, "matrix": [1, 14], "x": 217, "y": 20},
+            {"flags": 2, "x": 224, "y": 12},
+            {"flags": 2, "x": 0, "y": 22},
+            {"flags": 4, "matrix": [2, 0], "x": 10, "y": 30},
+            {"flags": 4, "matrix": [2, 1], "x": 27, "y": 30},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 30},
+            {"flags": 4, "matrix": [2, 3], "x": 54, "y": 30},
+            {"flags": 4, "matrix": [2, 4], "x": 69, "y": 30},
+            {"flags": 4, "matrix": [2, 5], "x": 82, "y": 30},
+            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 30},
+            {"flags": 4, "matrix": [2, 7], "x": 110, "y": 30},
+            {"flags": 4, "matrix": [2, 8], "x": 123, "y": 30},
+            {"flags": 4, "matrix": [2, 9], "x": 138, "y": 30},
+            {"flags": 4, "matrix": [2, 10], "x": 151, "y": 30},
+            {"flags": 4, "matrix": [2, 11], "x": 165, "y": 30},
+            {"flags": 4, "matrix": [2, 12], "x": 179, "y": 30},
+            {"flags": 4, "matrix": [2, 13], "x": 196, "y": 30},
+            {"flags": 4, "matrix": [2, 14], "x": 217, "y": 30},
+            {"flags": 2, "x": 224, "y": 22},
+            {"flags": 4, "matrix": [3, 0], "x": 11, "y": 40},
+            {"flags": 4, "matrix": [3, 1], "x": 30, "y": 40},
+            {"flags": 4, "matrix": [3, 2], "x": 44, "y": 40},
+            {"flags": 4, "matrix": [3, 3], "x": 57, "y": 40},
+            {"flags": 4, "matrix": [3, 4], "x": 72, "y": 40},
+            {"flags": 4, "matrix": [3, 5], "x": 85, "y": 40},
+            {"flags": 4, "matrix": [3, 6], "x": 99, "y": 40},
+            {"flags": 4, "matrix": [3, 7], "x": 113, "y": 40},
+            {"flags": 4, "matrix": [3, 8], "x": 126, "y": 40},
+            {"flags": 4, "matrix": [3, 9], "x": 140, "y": 40},
+            {"flags": 4, "matrix": [3, 10], "x": 154, "y": 40},
+            {"flags": 4, "matrix": [3, 11], "x": 169, "y": 40},
+            {"flags": 4, "matrix": [3, 12], "x": 190, "y": 40},
+            {"flags": 4, "matrix": [3, 14], "x": 217, "y": 40},
+            {"flags": 2, "x": 0, "y": 42},
+            {"flags": 4, "matrix": [4, 0], "x": 15, "y": 50},
+            {"flags": 4, "matrix": [4, 1], "x": 37, "y": 50},
+            {"flags": 4, "matrix": [4, 2], "x": 51, "y": 50},
+            {"flags": 4, "matrix": [4, 3], "x": 66, "y": 50},
+            {"flags": 4, "matrix": [4, 4], "x": 79, "y": 50},
+            {"flags": 4, "matrix": [4, 5], "x": 93, "y": 50},
+            {"flags": 4, "matrix": [4, 6], "x": 107, "y": 50},
+            {"flags": 4, "matrix": [4, 7], "x": 120, "y": 50},
+            {"flags": 4, "matrix": [4, 8], "x": 134, "y": 50},
+            {"flags": 4, "matrix": [4, 9], "x": 148, "y": 50},
+            {"flags": 4, "matrix": [4, 10], "x": 161, "y": 50},
+            {"flags": 4, "matrix": [4, 11], "x": 180, "y": 50},
+            {"flags": 4, "matrix": [4, 13], "x": 202, "y": 53},
+            {"flags": 2, "x": 224, "y": 42},
+            {"flags": 2, "x": 0, "y": 51},
+            {"flags": 4, "matrix": [5, 0], "x": 8, "y": 60},
+            {"flags": 4, "matrix": [5, 1], "x": 26, "y": 60},
+            {"flags": 4, "matrix": [5, 2], "x": 42, "y": 60},
+            {"flags": 4, "matrix": [5, 5], "x": 94, "y": 60},
+            {"flags": 4, "matrix": [5, 8], "x": 144, "y": 60},
+            {"flags": 4, "matrix": [5, 9], "x": 158, "y": 60},
+            {"flags": 4, "matrix": [5, 10], "x": 172, "y": 60},
+            {"flags": 4, "matrix": [5, 12], "x": 189, "y": 63},
+            {"flags": 4, "matrix": [5, 13], "x": 202, "y": 63},
+            {"flags": 4, "matrix": [5, 14], "x": 217, "y": 63},
+            {"flags": 2, "x": 224, "y": 51},
+            {"flags": 2, "x": 9, "y": 64},
+            {"flags": 2, "x": 38, "y": 64},
+            {"flags": 2, "x": 69, "y": 64},
+            {"flags": 2, "x": 96, "y": 64},
+            {"flags": 2, "x": 125, "y": 64},
+            {"flags": 2, "x": 154, "y": 64},
+            {"flags": 2, "x": 182, "y": 64},
+            {"flags": 2, "x": 211, "y": 64}
         ]
     },
     "encoder": {

keyboards/dyz/synthesis60/info.json

@@ -5,22 +5,7 @@
     "maintainer": "dayatz",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
-        "cols": [
-            "F7",
-            "F6",
-            "F5",
-            "F4",
-            "F1",
-            "F0",
-            "D7",
-            "D3",
-            "D2",
-            "E6",
-            "B3",
-            "B2",
-            "B1",
-            "B0"
-        ],
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D3", "D2", "E6", "B3", "B2", "B1", "B0"],
         "rows": ["B4", "B5", "B6", "D6", "D4"]
     },
     "rgblight": {

keyboards/dztech/tofu/ii/v1/info.json

@@ -18,72 +18,72 @@
     "rgb_matrix": {
         "driver": "IS31FL3737",
         "layout": [
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 },
-            { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 },
-            { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 },
-            { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 },
-            { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 },
-            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 },
-            { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 },
-            { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 },
-            { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 },
-            { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 },
-            { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 },
-            { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 },
-            { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 },
-            { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 },
-            { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 },
-            { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 },
-            { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 },
-            { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 },
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 },
-            { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 },
-            { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 },
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 },
-            { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 },
-            { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
-            { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 },
-            { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 },
-            { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 },
-            { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 },
-            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 },
-            { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 },
-            { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 },
-            { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 },
-            { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 },
-            { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 },
-            { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 },
-            { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 },
-            { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 },
-            { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 },
-            { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 },
-            { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 },
-            { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 },
-            { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 },
-            { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 },
-            { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 },
-            { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 },
-            { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 },
-            { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 },
-            { "flags": 1, "matrix": [4, 8], "x": 151, "y": 64 },
-            { "flags": 1, "matrix": [4, 10], "x": 170, "y": 64 },
-            { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 },
-            { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 },
-            { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 }
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0},
+            {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0},
+            {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
+            {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
+            {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
+            {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
+            {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
+            {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
+            {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16},
+            {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16},
+            {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16},
+            {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16},
+            {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16},
+            {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
+            {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
+            {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32},
+            {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32},
+            {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32},
+            {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32},
+            {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32},
+            {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32},
+            {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48},
+            {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48},
+            {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48},
+            {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48},
+            {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48},
+            {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48},
+            {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48},
+            {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48},
+            {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48},
+            {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48},
+            {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48},
+            {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48},
+            {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48},
+            {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
+            {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
+            {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
+            {"flags": 1, "matrix": [4, 8], "x": 151, "y": 64},
+            {"flags": 1, "matrix": [4, 10], "x": 170, "y": 64},
+            {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
+            {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
+            {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
         ]
     },
     "usb": {
@@ -94,72 +94,72 @@
     "layouts": {
         "LAYOUT": {
             "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], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "x": 15, "y": 0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "x": 15, "y": 1 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0, "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], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 },
-                { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "matrix": [4, 12], "x": 13, "y": 4 },
-                { "matrix": [4, 13], "x": 14, "y": 4 },
-                { "matrix": [4, 14], "x": 15, "y": 4 }
+                {"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], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "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], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "w": 1.25, "x": 10, "y": 4},
+                {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }

keyboards/ebastler/e80_1800/info.json

@@ -40,566 +40,566 @@
     "layouts": {
         "LAYOUT_1800_all": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_iso_6u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_iso_7u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5},
-                {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7},
-                {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5},
-                {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [6, 2], "label": "Alt", "x": 1.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 7},
+                {"matrix": [6, 9], "label": "AltGr", "x": 10, "y": 6, "w": 1.5},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 11.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_ansi_6u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_ansi_7u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5},
-                {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7},
-                {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5},
-                {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [6, 2], "label": "Alt", "x": 1.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 7},
+                {"matrix": [6, 9], "label": "AltGr", "x": 10, "y": 6, "w": 1.5},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 11.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         }
     }
 }

keyboards/ep/40/info.json

@@ -1,7 +1,7 @@
 {
-    "keyboard_name":"ep40",
+    "keyboard_name": "ep40",
     "manufacturer": "Elliot Powell",
-    "maintainer":"e11i0t23",
+    "maintainer": "e11i0t23",
     "usb": {
         "vid": "0xFEED",
         "pid": "0x4040",

keyboards/evyd13/fin_pad/info.json

@@ -33,55 +33,55 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"TAB", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"PEQL", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"BSPC", "x":3, "y":0},
-                {"matrix": [1, 0], "label":"NUM", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1.25},
-                {"matrix": [2, 0], "label":"P7", "x":0, "y":2.25},
-                {"matrix": [2, 1], "label":"P8", "x":1, "y":2.25},
-                {"matrix": [2, 2], "label":"P9", "x":2, "y":2.25},
-                {"matrix": [2, 3], "label":"PPLS", "x":3, "y":2.25},
-                {"matrix": [3, 0], "label":"P4", "x":0, "y":3.25},
-                {"matrix": [3, 1], "label":"P5", "x":1, "y":3.25},
-                {"matrix": [3, 2], "label":"P6", "x":2, "y":3.25},
-                {"matrix": [3, 3], "label":"PPLS", "x":3, "y":3.25},
-                {"matrix": [4, 0], "label":"P1", "x":0, "y":4.25},
-                {"matrix": [4, 1], "label":"P2", "x":1, "y":4.25},
-                {"matrix": [4, 2], "label":"P3", "x":2, "y":4.25},
-                {"matrix": [4, 3], "label":"PENT", "x":3, "y":4.25},
-                {"matrix": [5, 0], "label":"P0", "x":0, "y":5.25},
-                {"matrix": [5, 1], "label":"P0", "x":1, "y":5.25},
-                {"matrix": [5, 2], "label":"PDOT", "x":2, "y":5.25},
-                {"matrix": [5, 3], "label":"PENT", "x":3, "y":5.25}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "PEQL", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "BSPC", "x": 3, "y": 0},
+                {"matrix": [1, 0], "label": "NUM", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "label": "P7", "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "label": "P8", "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "label": "P9", "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25},
+                {"matrix": [3, 0], "label": "P4", "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "label": "P5", "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "label": "P6", "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "label": "PPLS", "x": 3, "y": 3.25},
+                {"matrix": [4, 0], "label": "P1", "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "label": "P2", "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "label": "P3", "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25},
+                {"matrix": [5, 0], "label": "P0", "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "label": "P0", "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "label": "PDOT", "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "label": "PENT", "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"TAB", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"PEQL", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"BSPC", "x":3, "y":0},
-                {"matrix": [1, 0], "label":"NUM", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1.25},
-                {"matrix": [2, 0], "label":"P7", "x":0, "y":2.25},
-                {"matrix": [2, 1], "label":"P8", "x":1, "y":2.25},
-                {"matrix": [2, 2], "label":"P9", "x":2, "y":2.25},
-                {"matrix": [3, 0], "label":"P4", "x":0, "y":3.25},
-                {"matrix": [3, 1], "label":"P5", "x":1, "y":3.25},
-                {"matrix": [3, 2], "label":"P6", "x":2, "y":3.25},
-                {"matrix": [3, 3], "label":"PPLS", "x":3, "y":2.25, "h":2},
-                {"matrix": [4, 0], "label":"P1", "x":0, "y":4.25},
-                {"matrix": [4, 1], "label":"P2", "x":1, "y":4.25},
-                {"matrix": [4, 2], "label":"P3", "x":2, "y":4.25},
-                {"matrix": [5, 0], "label":"P0", "x":0, "y":5.25},
-                {"matrix": [5, 2], "label":"PDOT", "x":2, "y":5.25},
-                {"matrix": [5, 3], "label":"PENT", "x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "PEQL", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "BSPC", "x": 3, "y": 0},
+                {"matrix": [1, 0], "label": "NUM", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "label": "P7", "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "label": "P8", "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "label": "P9", "x": 2, "y": 2.25},
+                {"matrix": [3, 0], "label": "P4", "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "label": "P5", "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "label": "P6", "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [4, 0], "label": "P1", "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "label": "P2", "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "label": "P3", "x": 2, "y": 4.25},
+                {"matrix": [5, 0], "label": "P0", "x": 0, "y": 5.25},
+                {"matrix": [5, 2], "label": "PDOT", "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }

keyboards/evyd13/nt650/info.json

@@ -34,71 +34,71 @@
     "layouts": {
         "LAYOUT_ansi_split_space": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [1, 0], "label":"1", "x":1, "y":0},
-                {"matrix": [1, 1], "label":"2", "x":2, "y":0},
-                {"matrix": [1, 2], "label":"3", "x":3, "y":0},
-                {"matrix": [1, 3], "label":"4", "x":4, "y":0},
-                {"matrix": [2, 3], "label":"5", "x":5, "y":0},
-                {"matrix": [2, 4], "label":"6", "x":6, "y":0},
-                {"matrix": [1, 4], "label":"7", "x":7, "y":0},
-                {"matrix": [1, 5], "label":"8", "x":8, "y":0},
-                {"matrix": [1, 6], "label":"9", "x":9, "y":0},
-                {"matrix": [1, 7], "label":"0", "x":10, "y":0},
-                {"matrix": [2, 7], "label":"MINS", "x":11, "y":0},
-                {"matrix": [2, 5], "label":"EQL", "x":12, "y":0},
-                {"matrix": [3, 8], "label":"BSPC", "x":13, "y":0, "w":2},
-                {"matrix": [3, 0], "label":"TAB", "x":0, "y":1, "w":1.5},
-                {"matrix": [5, 0], "label":"Q", "x":1.5, "y":1},
-                {"matrix": [5, 1], "label":"W", "x":2.5, "y":1},
-                {"matrix": [5, 2], "label":"E", "x":3.5, "y":1},
-                {"matrix": [5, 3], "label":"R", "x":4.5, "y":1},
-                {"matrix": [3, 3], "label":"T", "x":5.5, "y":1},
-                {"matrix": [3, 4], "label":"Y", "x":6.5, "y":1},
-                {"matrix": [5, 4], "label":"U", "x":7.5, "y":1},
-                {"matrix": [5, 5], "label":"I", "x":8.5, "y":1},
-                {"matrix": [5, 6], "label":"O", "x":9.5, "y":1},
-                {"matrix": [5, 7], "label":"P", "x":10.5, "y":1},
-                {"matrix": [3, 7], "label":"LBRC", "x":11.5, "y":1},
-                {"matrix": [3, 5], "label":"RBRC", "x":12.5, "y":1},
-                {"matrix": [4, 8], "label":"BSLS", "x":13.5, "y":1, "w":1.5},
-                {"matrix": [3, 1], "label":"CAPS", "x":0, "y":2, "w":1.75},
-                {"matrix": [4, 0], "label":"A", "x":1.75, "y":2},
-                {"matrix": [4, 1], "label":"S", "x":2.75, "y":2},
-                {"matrix": [4, 2], "label":"D", "x":3.75, "y":2},
-                {"matrix": [4, 3], "label":"F", "x":4.75, "y":2},
-                {"matrix": [0, 3], "label":"G", "x":5.75, "y":2},
-                {"matrix": [0, 4], "label":"H", "x":6.75, "y":2},
-                {"matrix": [4, 4], "label":"J", "x":7.75, "y":2},
-                {"matrix": [4, 5], "label":"K", "x":8.75, "y":2},
-                {"matrix": [4, 6], "label":"L", "x":9.75, "y":2},
-                {"matrix": [4, 7], "label":"SCLN", "x":10.75, "y":2},
-                {"matrix": [0, 7], "label":"QUOT", "x":11.75, "y":2},
-                {"matrix": [6, 8], "label":"ENT", "x":12.75, "y":2, "w":2.25},
-                {"matrix": [3, 10], "label":"LSFT", "x":0, "y":3, "w":2.25},
-                {"matrix": [6, 0], "label":"Z", "x":2.25, "y":3},
-                {"matrix": [6, 1], "label":"X", "x":3.25, "y":3},
-                {"matrix": [6, 2], "label":"C", "x":4.25, "y":3},
-                {"matrix": [6, 3], "label":"V", "x":5.25, "y":3},
-                {"matrix": [7, 3], "label":"B", "x":6.25, "y":3},
-                {"matrix": [7, 4], "label":"N", "x":7.25, "y":3},
-                {"matrix": [6, 4], "label":"M", "x":8.25, "y":3},
-                {"matrix": [6, 5], "label":"COMM", "x":9.25, "y":3},
-                {"matrix": [6, 6], "label":"DOT", "x":10.25, "y":3},
-                {"matrix": [7, 7], "label":"SLSH", "x":11.25, "y":3},
-                {"matrix": [4, 10], "label":"RSFT", "x":12.25, "y":3, "w":1.75},
-                {"matrix": [3, 9], "label":"APP", "x":14, "y":3},
-                {"matrix": [2, 11], "label":"LCTL", "x":0, "y":4, "w":1.25},
-                {"matrix": [3, 11], "label":"LGUI", "x":1.25, "y":4},
-                {"matrix": [0, 9], "label":"LALT", "x":2.25, "y":4, "w":1.25},
-                {"matrix": [0, 13], "label":"SPC", "x":3.5, "y":4, "w":3},
-                {"matrix": [6, 9], "label":"SPC", "x":6.5, "y":4, "w":3},
-                {"matrix": [7, 9], "label":"RALT", "x":9.5, "y":4, "w":1.25},
-                {"matrix": [6, 11], "label":"RCTL", "x":10.75, "y":4},
-                {"matrix": [0, 12], "label":"UP", "x":13, "y":4},
-                {"matrix": [7, 12], "label":"LEFT", "x":12, "y":5},
-                {"matrix": [7, 13], "label":"DOWN", "x":13, "y":5},
-                {"matrix": [7, 14], "label":"RGHT", "x":14, "y":5}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
+                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
+                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
+                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
+                {"matrix": [2, 3], "label": "5", "x": 5, "y": 0},
+                {"matrix": [2, 4], "label": "6", "x": 6, "y": 0},
+                {"matrix": [1, 4], "label": "7", "x": 7, "y": 0},
+                {"matrix": [1, 5], "label": "8", "x": 8, "y": 0},
+                {"matrix": [1, 6], "label": "9", "x": 9, "y": 0},
+                {"matrix": [1, 7], "label": "0", "x": 10, "y": 0},
+                {"matrix": [2, 7], "label": "MINS", "x": 11, "y": 0},
+                {"matrix": [2, 5], "label": "EQL", "x": 12, "y": 0},
+                {"matrix": [3, 8], "label": "BSPC", "x": 13, "y": 0, "w": 2},
+                {"matrix": [3, 0], "label": "TAB", "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 0], "label": "Q", "x": 1.5, "y": 1},
+                {"matrix": [5, 1], "label": "W", "x": 2.5, "y": 1},
+                {"matrix": [5, 2], "label": "E", "x": 3.5, "y": 1},
+                {"matrix": [5, 3], "label": "R", "x": 4.5, "y": 1},
+                {"matrix": [3, 3], "label": "T", "x": 5.5, "y": 1},
+                {"matrix": [3, 4], "label": "Y", "x": 6.5, "y": 1},
+                {"matrix": [5, 4], "label": "U", "x": 7.5, "y": 1},
+                {"matrix": [5, 5], "label": "I", "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "label": "O", "x": 9.5, "y": 1},
+                {"matrix": [5, 7], "label": "P", "x": 10.5, "y": 1},
+                {"matrix": [3, 7], "label": "LBRC", "x": 11.5, "y": 1},
+                {"matrix": [3, 5], "label": "RBRC", "x": 12.5, "y": 1},
+                {"matrix": [4, 8], "label": "BSLS", "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "label": "CAPS", "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "label": "A", "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "label": "S", "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "label": "D", "x": 3.75, "y": 2},
+                {"matrix": [4, 3], "label": "F", "x": 4.75, "y": 2},
+                {"matrix": [0, 3], "label": "G", "x": 5.75, "y": 2},
+                {"matrix": [0, 4], "label": "H", "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "label": "J", "x": 7.75, "y": 2},
+                {"matrix": [4, 5], "label": "K", "x": 8.75, "y": 2},
+                {"matrix": [4, 6], "label": "L", "x": 9.75, "y": 2},
+                {"matrix": [4, 7], "label": "SCLN", "x": 10.75, "y": 2},
+                {"matrix": [0, 7], "label": "QUOT", "x": 11.75, "y": 2},
+                {"matrix": [6, 8], "label": "ENT", "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 10], "label": "LSFT", "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 0], "label": "Z", "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "label": "X", "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "label": "C", "x": 4.25, "y": 3},
+                {"matrix": [6, 3], "label": "V", "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "label": "B", "x": 6.25, "y": 3},
+                {"matrix": [7, 4], "label": "N", "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "label": "M", "x": 8.25, "y": 3},
+                {"matrix": [6, 5], "label": "COMM", "x": 9.25, "y": 3},
+                {"matrix": [6, 6], "label": "DOT", "x": 10.25, "y": 3},
+                {"matrix": [7, 7], "label": "SLSH", "x": 11.25, "y": 3},
+                {"matrix": [4, 10], "label": "RSFT", "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 9], "label": "APP", "x": 14, "y": 3},
+                {"matrix": [2, 11], "label": "LCTL", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [3, 11], "label": "LGUI", "x": 1.25, "y": 4},
+                {"matrix": [0, 9], "label": "LALT", "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 13], "label": "SPC", "x": 3.5, "y": 4, "w": 3},
+                {"matrix": [6, 9], "label": "SPC", "x": 6.5, "y": 4, "w": 3},
+                {"matrix": [7, 9], "label": "RALT", "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 11], "label": "RCTL", "x": 10.75, "y": 4},
+                {"matrix": [0, 12], "label": "UP", "x": 13, "y": 4},
+                {"matrix": [7, 12], "label": "LEFT", "x": 12, "y": 5},
+                {"matrix": [7, 13], "label": "DOWN", "x": 13, "y": 5},
+                {"matrix": [7, 14], "label": "RGHT", "x": 14, "y": 5}
             ]
         }
     }

keyboards/ez_maker/directpins/promicro/info.json

@@ -30,16 +30,16 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"D3", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"D2", "matrix": [1, 0], "x":0, "y":1},
-                {"label":"D1", "matrix": [2, 0], "x":0, "y":4}, {"label":"F4", "matrix": [2, 1], "x":2, "y":4},
-                {"label":"D0", "matrix": [3, 0], "x":0, "y":5}, {"label":"F5", "matrix": [3, 1], "x":2, "y":5},
-                {"label":"D4", "matrix": [4, 0], "x":0, "y":6}, {"label":"F6", "matrix": [4, 1], "x":2, "y":6},
-                {"label":"C6", "matrix": [5, 0], "x":0, "y":7}, {"label":"F7", "matrix": [5, 1], "x":2, "y":7},
-                {"label":"D7", "matrix": [6, 0], "x":0, "y":8}, {"label":"B1", "matrix": [6, 1], "x":2, "y":8},
-                {"label":"E6", "matrix": [7, 0], "x":0, "y":9}, {"label":"B3", "matrix": [7, 1], "x":2, "y":9},
-                {"label":"B4", "matrix": [8, 0], "x":0, "y":10}, {"label":"B2", "matrix": [8, 1], "x":2, "y":10},
-                {"label":"B5", "matrix": [9, 0], "x":0, "y":11}, {"label":"B6", "matrix": [9, 1], "x":2, "y":11}
+                {"label": "D3", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D2", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D1", "matrix": [2, 0], "x": 0, "y": 4}, {"label": "F4", "matrix": [2, 1], "x": 2, "y": 4},
+                {"label": "D0", "matrix": [3, 0], "x": 0, "y": 5}, {"label": "F5", "matrix": [3, 1], "x": 2, "y": 5},
+                {"label": "D4", "matrix": [4, 0], "x": 0, "y": 6}, {"label": "F6", "matrix": [4, 1], "x": 2, "y": 6},
+                {"label": "C6", "matrix": [5, 0], "x": 0, "y": 7}, {"label": "F7", "matrix": [5, 1], "x": 2, "y": 7},
+                {"label": "D7", "matrix": [6, 0], "x": 0, "y": 8}, {"label": "B1", "matrix": [6, 1], "x": 2, "y": 8},
+                {"label": "E6", "matrix": [7, 0], "x": 0, "y": 9}, {"label": "B3", "matrix": [7, 1], "x": 2, "y": 9},
+                {"label": "B4", "matrix": [8, 0], "x": 0, "y": 10}, {"label": "B2", "matrix": [8, 1], "x": 2, "y": 10},
+                {"label": "B5", "matrix": [9, 0], "x": 0, "y": 11}, {"label": "B6", "matrix": [9, 1], "x": 2, "y": 11}
             ]
         }
     }

keyboards/ez_maker/directpins/rp2040/info.json

@@ -41,22 +41,22 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"GP0", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"GP1", "matrix": [1, 0], "x":0, "y":1},
-                {"label":"GP2", "matrix": [2, 0], "x":0, "y":3},
-                {"label":"GP3", "matrix": [3, 0], "x":0, "y":4},
-                {"label":"GP4", "matrix": [4, 0], "x":0, "y":5},
-                {"label":"GP5", "matrix": [5, 0], "x":0, "y":6}, {"label":"GP28", "matrix": [5, 1], "x":2, "y":6},
-                {"label":"GP6", "matrix": [6, 0], "x":0, "y":8}, {"label":"GP27", "matrix": [6, 1], "x":2, "y":8},
-                {"label":"GP7", "matrix": [7, 0], "x":0, "y":9}, {"label":"GP26", "matrix": [7, 1], "x":2, "y":9},
-                {"label":"GP8", "matrix": [8, 0], "x":0, "y":10},
-                {"label":"GP9", "matrix": [9, 0], "x":0, "y":11}, {"label":"GP22", "matrix": [9, 1], "x":2, "y":11},
-                {"label":"GP10", "matrix": [10, 0], "x":0, "y":13}, {"label":"GP21", "matrix": [10, 1], "x":2, "y":13},
-                {"label":"GP11", "matrix": [11, 0], "x":0, "y":14}, {"label":"GP20", "matrix": [11, 1], "x":2, "y":14},
-                {"label":"GP12", "matrix": [12, 0], "x":0, "y":15}, {"label":"GP19", "matrix": [12, 1], "x":2, "y":15},
-                {"label":"GP13", "matrix": [13, 0], "x":0, "y":16}, {"label":"GP18", "matrix": [13, 1], "x":2, "y":16},
-                {"label":"GP14", "matrix": [14, 0], "x":0, "y":18}, {"label":"GP17", "matrix": [14, 1], "x":2, "y":18},
-                {"label":"GP15", "matrix": [15, 0], "x":0, "y":19}, {"label":"GP16", "matrix": [15, 1], "x":2, "y":19}
+                {"label": "GP0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "GP1", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "GP2", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "GP3", "matrix": [3, 0], "x": 0, "y": 4},
+                {"label": "GP4", "matrix": [4, 0], "x": 0, "y": 5},
+                {"label": "GP5", "matrix": [5, 0], "x": 0, "y": 6}, {"label": "GP28", "matrix": [5, 1], "x": 2, "y": 6},
+                {"label": "GP6", "matrix": [6, 0], "x": 0, "y": 8}, {"label": "GP27", "matrix": [6, 1], "x": 2, "y": 8},
+                {"label": "GP7", "matrix": [7, 0], "x": 0, "y": 9}, {"label": "GP26", "matrix": [7, 1], "x": 2, "y": 9},
+                {"label": "GP8", "matrix": [8, 0], "x": 0, "y": 10},
+                {"label": "GP9", "matrix": [9, 0], "x": 0, "y": 11}, {"label": "GP22", "matrix": [9, 1], "x": 2, "y": 11},
+                {"label": "GP10", "matrix": [10, 0], "x": 0, "y": 13}, {"label": "GP21", "matrix": [10, 1], "x": 2, "y": 13},
+                {"label": "GP11", "matrix": [11, 0], "x": 0, "y": 14}, {"label": "GP20", "matrix": [11, 1], "x": 2, "y": 14},
+                {"label": "GP12", "matrix": [12, 0], "x": 0, "y": 15}, {"label": "GP19", "matrix": [12, 1], "x": 2, "y": 15},
+                {"label": "GP13", "matrix": [13, 0], "x": 0, "y": 16}, {"label": "GP18", "matrix": [13, 1], "x": 2, "y": 16},
+                {"label": "GP14", "matrix": [14, 0], "x": 0, "y": 18}, {"label": "GP17", "matrix": [14, 1], "x": 2, "y": 18},
+                {"label": "GP15", "matrix": [15, 0], "x": 0, "y": 19}, {"label": "GP16", "matrix": [15, 1], "x": 2, "y": 19}
             ]
         }
     }

keyboards/ez_maker/directpins/teensy_2/info.json

@@ -33,17 +33,17 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B0", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"F0", "matrix": [0, 1], "x":4, "y":0},
-                {"label":"B1", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"F1", "matrix": [1, 1], "x":4, "y":1},
-                {"label":"B2", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"F4", "matrix": [2, 1], "x":4, "y":2},
-                {"label":"B3", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"F5", "matrix": [3, 1], "x":4, "y":3},
-                {"label":"B7", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"F6", "matrix": [4, 1], "x":4, "y":4},
-                {"label":"D0", "matrix": [5, 0], "x":0, "y":5},                                                                                                       {"label":"F7", "matrix": [5, 1], "x":4, "y":5},
-                {"label":"D1", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B6", "matrix": [6, 1], "x":4, "y":6},
-                {"label":"D2", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"B5", "matrix": [7, 1], "x":4, "y":7},
-                {"label":"D3", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"B4", "matrix": [8, 1], "x":4, "y":8},
-                {"label":"C6", "matrix": [9, 0], "x":0, "y":9},                                                                                                       {"label":"D7", "matrix": [9, 1], "x":4, "y":9},
-                {"label":"C7", "matrix": [10, 0], "x":0, "y":10}, {"label":"D5", "matrix": [11, 0], "x":1, "y":10}, {"label":"D4", "matrix": [11, 1], "x":3, "y":10}, {"label":"D6", "matrix": [10, 1], "x":4, "y":10}
+                {"label": "B0", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "F0", "matrix": [0, 1], "x": 4, "y": 0},
+                {"label": "B1", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "F1", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "B2", "matrix": [2, 0], "x": 0, "y": 2},                                                                                                       {"label": "F4", "matrix": [2, 1], "x": 4, "y": 2},
+                {"label": "B3", "matrix": [3, 0], "x": 0, "y": 3},                                                                                                       {"label": "F5", "matrix": [3, 1], "x": 4, "y": 3},
+                {"label": "B7", "matrix": [4, 0], "x": 0, "y": 4},                                                                                                       {"label": "F6", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "D0", "matrix": [5, 0], "x": 0, "y": 5},                                                                                                       {"label": "F7", "matrix": [5, 1], "x": 4, "y": 5},
+                {"label": "D1", "matrix": [6, 0], "x": 0, "y": 6},                                                                                                       {"label": "B6", "matrix": [6, 1], "x": 4, "y": 6},
+                {"label": "D2", "matrix": [7, 0], "x": 0, "y": 7},                                                                                                       {"label": "B5", "matrix": [7, 1], "x": 4, "y": 7},
+                {"label": "D3", "matrix": [8, 0], "x": 0, "y": 8},                                                                                                       {"label": "B4", "matrix": [8, 1], "x": 4, "y": 8},
+                {"label": "C6", "matrix": [9, 0], "x": 0, "y": 9},                                                                                                       {"label": "D7", "matrix": [9, 1], "x": 4, "y": 9},
+                {"label": "C7", "matrix": [10, 0], "x": 0, "y": 10}, {"label": "D5", "matrix": [11, 0], "x": 1, "y": 10}, {"label": "D4", "matrix": [11, 1], "x": 3, "y": 10}, {"label": "D6", "matrix": [10, 1], "x": 4, "y": 10}
             ]
         }
     }

keyboards/ez_maker/directpins/teensy_2pp/info.json

@@ -40,25 +40,25 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B7", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"B6", "matrix": [0, 3], "x":5, "y":0},
-                {"label":"D0", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"B5", "matrix": [1, 3], "x":5, "y":1},
-                {"label":"D1", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"B4", "matrix": [2, 3], "x":5, "y":2},
-                {"label":"D2", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"B3", "matrix": [3, 3], "x":5, "y":3},
-                {"label":"D3", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"B2", "matrix": [4, 3], "x":5, "y":4},
-                {"label":"D4", "matrix": [5, 0], "x":0, "y":5},   {"label":"E5", "matrix": [5, 1], "x":2, "y":5},   {"label":"E4", "matrix": [5, 2], "x":3, "y":5},   {"label":"B1", "matrix": [5, 3], "x":5, "y":5},
-                {"label":"D5", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B0", "matrix": [6, 3], "x":5, "y":6},
-                {"label":"D6", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"E7", "matrix": [7, 3], "x":5, "y":7},
-                {"label":"D7", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"E6", "matrix": [8, 3], "x":5, "y":8},
-                {"label":"E0", "matrix": [9, 0], "x":0, "y":9},
-                {"label":"E1", "matrix": [10, 0], "x":0, "y":10},
-                {"label":"C0", "matrix": [11, 0], "x":0, "y":11},                                                                                                     {"label":"F0", "matrix": [11, 3], "x":5, "y":11},
-                {"label":"C1", "matrix": [12, 0], "x":0, "y":12}, {"label":"A4", "matrix": [12, 1], "x":2, "y":12}, {"label":"A0", "matrix": [12, 2], "x":3, "y":12}, {"label":"F1", "matrix": [12, 3], "x":5, "y":12},
-                {"label":"C2", "matrix": [13, 0], "x":0, "y":13}, {"label":"A5", "matrix": [13, 1], "x":2, "y":13}, {"label":"A1", "matrix": [13, 2], "x":3, "y":13}, {"label":"F2", "matrix": [13, 3], "x":5, "y":13},
-                {"label":"C3", "matrix": [14, 0], "x":0, "y":14}, {"label":"A6", "matrix": [14, 1], "x":2, "y":14}, {"label":"A2", "matrix": [14, 2], "x":3, "y":14}, {"label":"F3", "matrix": [14, 3], "x":5, "y":14},
-                {"label":"C4", "matrix": [15, 0], "x":0, "y":15}, {"label":"A7", "matrix": [15, 1], "x":2, "y":15}, {"label":"A3", "matrix": [15, 2], "x":3, "y":15}, {"label":"F4", "matrix": [15, 3], "x":5, "y":15},
-                {"label":"C5", "matrix": [16, 0], "x":0, "y":16},                                                                                                     {"label":"F5", "matrix": [16, 3], "x":5, "y":16},
-                {"label":"C6", "matrix": [17, 0], "x":0, "y":17},                                                                                                     {"label":"F6", "matrix": [17, 3], "x":5, "y":17},
-                {"label":"C7", "matrix": [18, 0], "x":0, "y":18},                                                                                                     {"label":"F7", "matrix": [18, 3], "x":5, "y":18}
+                {"label": "B7", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "B6", "matrix": [0, 3], "x": 5, "y": 0},
+                {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "B5", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "D1", "matrix": [2, 0], "x": 0, "y": 2},                                                                                                       {"label": "B4", "matrix": [2, 3], "x": 5, "y": 2},
+                {"label": "D2", "matrix": [3, 0], "x": 0, "y": 3},                                                                                                       {"label": "B3", "matrix": [3, 3], "x": 5, "y": 3},
+                {"label": "D3", "matrix": [4, 0], "x": 0, "y": 4},                                                                                                       {"label": "B2", "matrix": [4, 3], "x": 5, "y": 4},
+                {"label": "D4", "matrix": [5, 0], "x": 0, "y": 5},   {"label": "E5", "matrix": [5, 1], "x": 2, "y": 5},   {"label": "E4", "matrix": [5, 2], "x": 3, "y": 5},   {"label": "B1", "matrix": [5, 3], "x": 5, "y": 5},
+                {"label": "D5", "matrix": [6, 0], "x": 0, "y": 6},                                                                                                       {"label": "B0", "matrix": [6, 3], "x": 5, "y": 6},
+                {"label": "D6", "matrix": [7, 0], "x": 0, "y": 7},                                                                                                       {"label": "E7", "matrix": [7, 3], "x": 5, "y": 7},
+                {"label": "D7", "matrix": [8, 0], "x": 0, "y": 8},                                                                                                       {"label": "E6", "matrix": [8, 3], "x": 5, "y": 8},
+                {"label": "E0", "matrix": [9, 0], "x": 0, "y": 9},
+                {"label": "E1", "matrix": [10, 0], "x": 0, "y": 10},
+                {"label": "C0", "matrix": [11, 0], "x": 0, "y": 11},                                                                                                     {"label": "F0", "matrix": [11, 3], "x": 5, "y": 11},
+                {"label": "C1", "matrix": [12, 0], "x": 0, "y": 12}, {"label": "A4", "matrix": [12, 1], "x": 2, "y": 12}, {"label": "A0", "matrix": [12, 2], "x": 3, "y": 12}, {"label": "F1", "matrix": [12, 3], "x": 5, "y": 12},
+                {"label": "C2", "matrix": [13, 0], "x": 0, "y": 13}, {"label": "A5", "matrix": [13, 1], "x": 2, "y": 13}, {"label": "A1", "matrix": [13, 2], "x": 3, "y": 13}, {"label": "F2", "matrix": [13, 3], "x": 5, "y": 13},
+                {"label": "C3", "matrix": [14, 0], "x": 0, "y": 14}, {"label": "A6", "matrix": [14, 1], "x": 2, "y": 14}, {"label": "A2", "matrix": [14, 2], "x": 3, "y": 14}, {"label": "F3", "matrix": [14, 3], "x": 5, "y": 14},
+                {"label": "C4", "matrix": [15, 0], "x": 0, "y": 15}, {"label": "A7", "matrix": [15, 1], "x": 2, "y": 15}, {"label": "A3", "matrix": [15, 2], "x": 3, "y": 15}, {"label": "F4", "matrix": [15, 3], "x": 5, "y": 15},
+                {"label": "C5", "matrix": [16, 0], "x": 0, "y": 16},                                                                                                     {"label": "F5", "matrix": [16, 3], "x": 5, "y": 16},
+                {"label": "C6", "matrix": [17, 0], "x": 0, "y": 17},                                                                                                     {"label": "F6", "matrix": [17, 3], "x": 5, "y": 17},
+                {"label": "C7", "matrix": [18, 0], "x": 0, "y": 18},                                                                                                     {"label": "F7", "matrix": [18, 3], "x": 5, "y": 18}
             ]
         }
     }

keyboards/foostan/cornelius/info.json

@@ -1,8 +1,8 @@
 {
-    "keyboard_name":"Cornelius",
-    "manufacturer":"Yushakobo",
-    "url":"",
-    "maintainer":"foostan",
+    "keyboard_name": "Cornelius",
+    "manufacturer": "Yushakobo",
+    "url": "",
+    "maintainer": "foostan",
     "usb": {
         "vid": "0x3265",
         "pid": "0x0005",

keyboards/frobiac/blackbowl/info.json

@@ -34,51 +34,51 @@
   "layouts": {
     "LAYOUT": {
        "layout": [
-                {"matrix": [5, 3], "label":"K", "x":0, "y":1},
-                {"matrix": [6, 3], "label":"U", "x":1, "y":0.5},
-                {"matrix": [7, 3], "label":"Q", "x":2, "y":0},
-                {"matrix": [8, 3], "label":".", "x":3, "y":0},
-                {"matrix": [9, 3], "label":"J", "x":4, "y":0},
+                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
+                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
 
-                {"matrix": [0, 3], "label":"P", "x":6, "y":0},
-                {"matrix": [1, 3], "label":"C", "x":7, "y":0},
-                {"matrix": [2, 3], "label":"L", "x":8, "y":0},
-                {"matrix": [3, 3], "label":"M", "x":9, "y":0.5},
-                {"matrix": [4, 3], "label":"F", "x":10, "y":1},
+                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
+                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
+                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
+                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
 
-                {"matrix": [5, 2], "label":"H", "x":0, "y":2},
-                {"matrix": [6, 2], "label":"I", "x":1, "y":1.5},
-                {"matrix": [7, 2], "label":"E", "x":2, "y":1},
-                {"matrix": [8, 2], "label":"A", "x":3, "y":1},
-                {"matrix": [9, 2], "label":"O", "x":4, "y":1},
+                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
+                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
+                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
 
-                {"matrix": [0, 2], "label":"D", "x":6, "y":1},
-                {"matrix": [1, 2], "label":"T", "x":7, "y":1},
-                {"matrix": [2, 2], "label":"R", "x":8, "y":1},
-                {"matrix": [3, 2], "label":"N", "x":9, "y":1.5},
-                {"matrix": [4, 2], "label":"S", "x":10, "y":2},
+                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
+                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
+                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
 
-                {"matrix": [5, 1], "label":"X", "x":0, "y":3},
-                {"matrix": [6, 1], "label":"Y", "x":1, "y":2.5},
-                {"matrix": [7, 1], "label":"-", "x":2, "y":2},
-                {"matrix": [8, 1], "label":",", "x":3, "y":2},
-                {"matrix": [9, 1], "label":"/", "x":4, "y":2},
+                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
+                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
+                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
+                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
 
-                {"matrix": [0, 1], "label":"B", "x":6, "y":2},
-                {"matrix": [1, 1], "label":"G", "x":7, "y":2},
-                {"matrix": [2, 1], "label":"W", "x":8, "y":2},
-                {"matrix": [3, 1], "label":"V", "x":9, "y":2.5},
-                {"matrix": [4, 1], "label":"Z", "x":10, "y":3},
+                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
+                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
+                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
 
-                {"matrix": [5, 0], "label":" ", "x":0, "y":0},
-                {"matrix": [7, 0], "label":"Gui", "x":2, "y":3},
-                {"matrix": [8, 0], "label":"tab", "x":3, "y":3},
-                {"matrix": [9, 0], "label":"spc", "x":4, "y":3},
+                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
+                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
+                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
 
-                {"matrix": [0, 0], "label":"L2", "x":6, "y":3},
-                {"matrix": [1, 0], "label":"Sh", "x":7, "y":3},
-                {"matrix": [2, 0], "label":"L3", "x":8, "y":3},
-                {"matrix": [4, 0], "label":"Fx", "x":10, "y":0}
+                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
        ]
     }
   }

keyboards/frobiac/blackflat/info.json

@@ -34,51 +34,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"K", "x":0, "y":1},
-                {"matrix": [0, 1], "label":"U", "x":1, "y":0.5},
-                {"matrix": [0, 2], "label":"Q", "x":2, "y":0},
-                {"matrix": [0, 3], "label":".", "x":3, "y":0},
-                {"matrix": [0, 4], "label":"J", "x":4, "y":0},
+                {"matrix": [0, 0], "label": "K", "x": 0, "y": 1},
+                {"matrix": [0, 1], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "J", "x": 4, "y": 0},
 
-                {"matrix": [4, 0], "label":"P", "x":6, "y":0},
-                {"matrix": [4, 1], "label":"C", "x":7, "y":0},
-                {"matrix": [4, 2], "label":"L", "x":8, "y":0},
-                {"matrix": [4, 3], "label":"M", "x":9, "y":0.5},
-                {"matrix": [4, 4], "label":"F", "x":10, "y":1},
+                {"matrix": [4, 0], "label": "P", "x": 6, "y": 0},
+                {"matrix": [4, 1], "label": "C", "x": 7, "y": 0},
+                {"matrix": [4, 2], "label": "L", "x": 8, "y": 0},
+                {"matrix": [4, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 4], "label": "F", "x": 10, "y": 1},
 
-                {"matrix": [1, 0], "label":"H", "x":0, "y":2},
-                {"matrix": [1, 1], "label":"I", "x":1, "y":1.5},
-                {"matrix": [1, 2], "label":"E", "x":2, "y":1},
-                {"matrix": [1, 3], "label":"A", "x":3, "y":1},
-                {"matrix": [1, 4], "label":"O", "x":4, "y":1},
+                {"matrix": [1, 0], "label": "H", "x": 0, "y": 2},
+                {"matrix": [1, 1], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "A", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "O", "x": 4, "y": 1},
 
-                {"matrix": [5, 0], "label":"D", "x":6, "y":1},
-                {"matrix": [5, 1], "label":"T", "x":7, "y":1},
-                {"matrix": [5, 2], "label":"R", "x":8, "y":1},
-                {"matrix": [5, 3], "label":"N", "x":9, "y":1.5},
-                {"matrix": [5, 4], "label":"S", "x":10, "y":2},
+                {"matrix": [5, 0], "label": "D", "x": 6, "y": 1},
+                {"matrix": [5, 1], "label": "T", "x": 7, "y": 1},
+                {"matrix": [5, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [5, 3], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [5, 4], "label": "S", "x": 10, "y": 2},
 
-                {"matrix": [2, 0], "label":"X", "x":0, "y":3},
-                {"matrix": [2, 1], "label":"Y", "x":1, "y":2.5},
-                {"matrix": [2, 2], "label":"-", "x":2, "y":2},
-                {"matrix": [2, 3], "label":",", "x":3, "y":2},
-                {"matrix": [2, 4], "label":"/", "x":4, "y":2},
+                {"matrix": [2, 0], "label": "X", "x": 0, "y": 3},
+                {"matrix": [2, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "label": "-", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": ",", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "/", "x": 4, "y": 2},
 
-                {"matrix": [6, 0], "label":"B", "x":6, "y":2},
-                {"matrix": [6, 1], "label":"G", "x":7, "y":2},
-                {"matrix": [6, 2], "label":"W", "x":8, "y":2},
-                {"matrix": [6, 3], "label":"V", "x":9, "y":2.5},
-                {"matrix": [6, 4], "label":"Z", "x":10, "y":3},
+                {"matrix": [6, 0], "label": "B", "x": 6, "y": 2},
+                {"matrix": [6, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [6, 2], "label": "W", "x": 8, "y": 2},
+                {"matrix": [6, 3], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [6, 4], "label": "Z", "x": 10, "y": 3},
 
-                {"matrix": [3, 0], "label":"", "x":0, "y":0},
-                {"matrix": [3, 2], "label":"Gui", "x":2, "y":3},
-                {"matrix": [3, 3], "label":"Tab", "x":3, "y":3},
-                {"matrix": [3, 4], "label":"Spc", "x":4, "y":3},
+                {"matrix": [3, 0], "label": "", "x": 0, "y": 0},
+                {"matrix": [3, 2], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "Tab", "x": 3, "y": 3},
+                {"matrix": [3, 4], "label": "Spc", "x": 4, "y": 3},
 
-                {"matrix": [7, 0], "label":"L2", "x":6, "y":3},
-                {"matrix": [7, 1], "label":"Sh", "x":7, "y":3},
-                {"matrix": [7, 2], "label":"L3", "x":8, "y":3},
-                {"matrix": [7, 4], "label":"Fx", "x":10, "y":0}
+                {"matrix": [7, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [7, 1], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [7, 2], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [7, 4], "label": "Fx", "x": 10, "y": 0}
             ]
         }
     }

keyboards/frobiac/hypernano/info.json

@@ -34,50 +34,50 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"K", "x":0, "y":0, "w":1.5},
-                { "matrix": [0, 1], "label":"U", "x":1.5, "y":0},
-                { "matrix": [0, 2], "label":"Q", "x":2.5, "y":0},
-                { "matrix": [0, 3], "label":".", "x":3.5, "y":0},
-                { "matrix": [0, 4], "label":"J", "x":4.5, "y":0},
-                { "matrix": [1, 1], "label":"P", "x":7.5, "y":0},
-                { "matrix": [1, 2], "label":"C", "x":8.5, "y":0},
-                { "matrix": [1, 3], "label":"L", "x":9.5, "y":0},
-                { "matrix": [1, 4], "label":"M", "x":10.5, "y":0},
-                { "matrix": [1, 5], "label":"F", "x":11.5, "y":0, "w":1.5},
-                { "matrix": [2, 0], "label":"H", "x":0, "y":1, "w":1.25},
-                { "matrix": [2, 1], "label":"I", "x":1.25, "y":1},
-                { "matrix": [2, 2], "label":"E", "x":2.25, "y":1},
-                { "matrix": [2, 3], "label":"A", "x":3.25, "y":1},
-                { "matrix": [2, 4], "label":"O", "x":4.25, "y":1},
-                { "matrix": [3, 1], "label":"D", "x":7.75, "y":1},
-                { "matrix": [3, 2], "label":"T", "x":8.75, "y":1},
-                { "matrix": [3, 3], "label":"R", "x":9.75, "y":1},
-                { "matrix": [3, 4], "label":"N", "x":10.75, "y":1},
-                { "matrix": [3, 5], "label":"S", "x":11.75, "y":1, "w":1.25},
-                { "matrix": [4, 0], "label":"X", "x":0, "y":2},
-                { "matrix": [4, 1], "label":"Y", "x":1, "y":2},
-                { "matrix": [4, 2], "label":"-", "x":2, "y":2},
-                { "matrix": [4, 3], "label":",", "x":3, "y":2},
-                { "matrix": [4, 4], "label":"/", "x":4, "y":2},
-                { "matrix": [4, 5], "label":"", "x":5, "y":2},
-                { "matrix": [5, 0], "label":"", "x":7, "y":2},
-                { "matrix": [5, 1], "label":"B", "x":8, "y":2},
-                { "matrix": [5, 2], "label":"G", "x":9, "y":2},
-                { "matrix": [5, 3], "label":"W", "x":10, "y":2},
-                { "matrix": [5, 4], "label":"V", "x":11, "y":2},
-                { "matrix": [5, 5], "label":"Z", "x":12, "y":2},
-                { "matrix": [6, 0], "label":"", "x":0, "y":3, "w":1.25},
-                { "matrix": [6, 1], "label":"", "x":1.25, "y":3},
-                { "matrix": [6, 2], "label":"Gui", "x":2.25, "y":3},
-                { "matrix": [6, 3], "label":"Tab", "x":3.25, "y":3},
-                { "matrix": [6, 4], "label":"Spc", "x":4.25, "y":3},
-                { "matrix": [6, 5], "label":"", "x":5.25, "y":3},
-                { "matrix": [7, 0], "label":"", "x":6.75, "y":3},
-                { "matrix": [7, 1], "label":"L2", "x":7.75, "y":3},
-                { "matrix": [7, 2], "label":"Sh", "x":8.75, "y":3},
-                { "matrix": [7, 3], "label":"L3", "x":9.75, "y":3},
-                { "matrix": [7, 4], "label":"", "x":10.75, "y":3},
-                { "matrix": [7, 5], "label":"", "x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "label": "K", "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "label": "U", "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "label": "Q", "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "label": ".", "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "label": "J", "x": 4.5, "y": 0},
+                {"matrix": [1, 1], "label": "P", "x": 7.5, "y": 0},
+                {"matrix": [1, 2], "label": "C", "x": 8.5, "y": 0},
+                {"matrix": [1, 3], "label": "L", "x": 9.5, "y": 0},
+                {"matrix": [1, 4], "label": "M", "x": 10.5, "y": 0},
+                {"matrix": [1, 5], "label": "F", "x": 11.5, "y": 0, "w": 1.5},
+                {"matrix": [2, 0], "label": "H", "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "label": "I", "x": 1.25, "y": 1},
+                {"matrix": [2, 2], "label": "E", "x": 2.25, "y": 1},
+                {"matrix": [2, 3], "label": "A", "x": 3.25, "y": 1},
+                {"matrix": [2, 4], "label": "O", "x": 4.25, "y": 1},
+                {"matrix": [3, 1], "label": "D", "x": 7.75, "y": 1},
+                {"matrix": [3, 2], "label": "T", "x": 8.75, "y": 1},
+                {"matrix": [3, 3], "label": "R", "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "label": "N", "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "label": "S", "x": 11.75, "y": 1, "w": 1.25},
+                {"matrix": [4, 0], "label": "X", "x": 0, "y": 2},
+                {"matrix": [4, 1], "label": "Y", "x": 1, "y": 2},
+                {"matrix": [4, 2], "label": "-", "x": 2, "y": 2},
+                {"matrix": [4, 3], "label": ",", "x": 3, "y": 2},
+                {"matrix": [4, 4], "label": "/", "x": 4, "y": 2},
+                {"matrix": [4, 5], "label": "", "x": 5, "y": 2},
+                {"matrix": [5, 0], "label": "", "x": 7, "y": 2},
+                {"matrix": [5, 1], "label": "B", "x": 8, "y": 2},
+                {"matrix": [5, 2], "label": "G", "x": 9, "y": 2},
+                {"matrix": [5, 3], "label": "W", "x": 10, "y": 2},
+                {"matrix": [5, 4], "label": "V", "x": 11, "y": 2},
+                {"matrix": [5, 5], "label": "Z", "x": 12, "y": 2},
+                {"matrix": [6, 0], "label": "", "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "label": "", "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "label": "Gui", "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "label": "Tab", "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "label": "Spc", "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "label": "", "x": 5.25, "y": 3},
+                {"matrix": [7, 0], "label": "", "x": 6.75, "y": 3},
+                {"matrix": [7, 1], "label": "L2", "x": 7.75, "y": 3},
+                {"matrix": [7, 2], "label": "Sh", "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "label": "L3", "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "label": "", "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "label": "", "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }

keyboards/geistmaschine/geist/info.json

@@ -33,237 +33,237 @@
     "layouts": {
         "LAYOUT_65_all": {
             "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "matrix":[1, 6] },
-              {"x":15.25, "y":0, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "matrix": [1, 6]},
+              {"x": 15.25, "y": 0, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "matrix":[4, 6] },
-              {"x":14, "y":2, "w":2.25, "matrix":[5, 6] },
-              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "matrix": [4, 6]},
+              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
+              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] },
-              {"x":2.5, "y":3, "matrix":[7, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
+              {"x": 2.5, "y": 3, "matrix": [7, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":2.25, "matrix":[8, 2] },
-              {"x":7.25, "y":4, "w":1.25, "matrix":[8, 3] },
-              {"x":8.5, "y":4, "w":2.75, "matrix":[8, 4] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 2.25, "matrix": [8, 2]},
+              {"x": 7.25, "y": 4, "w": 1.25, "matrix": [8, 3]},
+              {"x": 8.5, "y": 4, "w": 2.75, "matrix": [8, 4]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "w":2, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "w":2.25, "matrix":[5, 6] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":2.25, "matrix":[6, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 2.25, "matrix": [6, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":6.25, "matrix":[8, 3] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
           ]
         },
         "LAYOUT_65_iso": {
           "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "w":2, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "matrix":[4, 6] },
-              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "matrix": [4, 6]},
+              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] },
-              {"x":2.5, "y":3, "matrix":[7, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
+              {"x": 2.5, "y": 3, "matrix": [7, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":6.25, "matrix":[8, 3] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
           ]
         }
     }

keyboards/geistmaschine/macropod/info.json

@@ -27,10 +27,10 @@
     "layouts": {
         "LAYOUT_fourkey": {
             "layout": [
-              {"x":0, "y":0, "matrix":[0, 0]},
-              {"x":0, "y":1.25, "matrix":[0, 1]},
-              {"x":0, "y":2.25, "matrix":[0, 2]},
-              {"x":0, "y":3.25, "matrix":[0, 3]}
+              {"x": 0, "y": 0, "matrix": [0, 0]},
+              {"x": 0, "y": 1.25, "matrix": [0, 1]},
+              {"x": 0, "y": 2.25, "matrix": [0, 2]},
+              {"x": 0, "y": 3.25, "matrix": [0, 3]}
             ]
         }
     }

keyboards/ghs/jem/info.json

@@ -48,230 +48,230 @@
     "layouts": {
         "LAYOUT_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, 13], "x":13, "y":0, "w":2 },
-                { "matrix": [1, 14], "x":15, "y":0 },
+                {"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, "w": 2},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x":15, "y":1},
+                {"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, 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, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                { "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": [4, 14], "x":15, "y":3 },
+                {"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": [4, 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, 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":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"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": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 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, "w":2 },
-                { "matrix": [1, 14], "x":15, "y":0 },
+                {"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, "w": 2},
+                {"matrix": [1, 14], "x": 15, "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, 14], "x":15, "y":1},
+                {"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, 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, 13], "x":12.75, "y":2 },
-                { "matrix": [1, 13], "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"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, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 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": [4, 14], "x":15, "y":3 },
+                {"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, 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, 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":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"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": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "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": [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":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, 14], "x":15, "y":1},
+                {"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, 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, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 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": [4, 14], "x":15, "y":3 },
+                {"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, 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, 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":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"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": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }

keyboards/gl516/xr63gl/info.json

@@ -29,69 +29,69 @@
     "layouts": {
         "LAYOUT_63_ansi": {
             "layout": [
-                { "label":"ESC", "matrix": [0, 1], "x": 0, "y": 0 },
-                { "label":"1!", "matrix": [0, 2], "x": 1, "y": 0 },
-                { "label":"2@", "matrix": [0, 3], "x": 2, "y": 0 },
-                { "label":"3#", "matrix": [0, 4], "x": 3, "y": 0 },
-                { "label":"4$", "matrix": [0, 5], "x": 4, "y": 0 },
-                { "label":"5%", "matrix": [0, 6], "x": 5, "y": 0 },
-                { "label":"6^", "matrix": [0, 7], "x": 6, "y": 0 },
-                { "label":"7&", "matrix": [0, 8], "x": 7, "y": 0 },
-                { "label":"8*", "matrix": [1, 0], "x": 8, "y": 0 },
-                { "label":"9(", "matrix": [1, 2], "x": 9, "y": 0 },
-                { "label":"0)", "matrix": [1, 3], "x": 10, "y": 0 },
-                { "label":"-_", "matrix": [1, 4], "x": 11, "y": 0 },
-                { "label":"=+", "matrix": [1, 5], "x": 12, "y": 0 },
-                { "label":"Backspace", "matrix": [1, 6], "w": 2, "x": 13, "y": 0 },
-                { "label":"Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label":"Q", "matrix": [2, 1], "x": 1.5, "y": 1 },
-                { "label":"W", "matrix": [2, 3], "x": 2.5, "y": 1 },
-                { "label":"E", "matrix": [2, 4], "x": 3.5, "y": 1 },
-                { "label":"R", "matrix": [2, 5], "x": 4.5, "y": 1 },
-                { "label":"T", "matrix": [2, 6], "x": 5.5, "y": 1 },
-                { "label":"Y", "matrix": [2, 7], "x": 6.5, "y": 1 },
-                { "label":"U", "matrix": [2, 8], "x": 7.5, "y": 1 },
-                { "label":"I", "matrix": [3, 0], "x": 8.5, "y": 1 },
-                { "label":"O", "matrix": [3, 1], "x": 9.5, "y": 1 },
-                { "label":"P", "matrix": [3, 2], "x": 10.5, "y": 1 },
-                { "label":"[{", "matrix": [3, 4], "x": 11.5, "y": 1 },
-                { "label":"]}", "matrix": [3, 5], "x": 12.5, "y": 1 },
-                { "label":"\\|", "matrix": [3, 6], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label":"Caps Lock", "matrix": [4, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label":"A", "matrix": [4, 1], "x": 1.75, "y": 2 },
-                { "label":"S", "matrix": [4, 2], "x": 2.75, "y": 2 },
-                { "label":"D", "matrix": [4, 3], "x": 3.75, "y": 2 },
-                { "label":"F", "matrix": [4, 5], "x": 4.75, "y": 2 },
-                { "label":"G", "matrix": [4, 6], "x": 5.75, "y": 2 },
-                { "label":"H", "matrix": [4, 7], "x": 6.75, "y": 2 },
-                { "label":"J", "matrix": [4, 8], "x": 7.75, "y": 2 },
-                { "label":"K", "matrix": [5, 0], "x": 8.75, "y": 2 },
-                { "label":"L", "matrix": [5, 1], "x": 9.75, "y": 2 },
-                { "label":";:", "matrix": [5, 2], "x": 10.75, "y": 2 },
-                { "label":"'\"", "matrix": [5, 3], "x": 11.75, "y": 2 },
-                { "label":"Enter", "matrix": [5, 4], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label":"Shift", "matrix": [6, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label":"Z", "matrix": [6, 1], "x": 2.25, "y": 3 },
-                { "label":"X", "matrix": [6, 2], "x": 3.25, "y": 3 },
-                { "label":"C", "matrix": [6, 3], "x": 4.25, "y": 3 },
-                { "label":"V", "matrix": [6, 4], "x": 5.25, "y": 3 },
-                { "label":"B", "matrix": [6, 5], "x": 6.25, "y": 3 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 3 },
-                { "label":"M", "matrix": [6, 8], "x": 8.25, "y": 3 },
-                { "label":",<", "matrix": [7, 0], "x": 9.25, "y": 3 },
-                { "label":".>", "matrix": [7, 1], "x": 10.25, "y": 3 },
-                { "label":"/?", "matrix": [7, 2], "x": 11.25, "y": 3 },
-                { "label":"Shift", "matrix": [7, 3], "w": 1.25, "x": 12.25, "y": 3 },
-                { "label":"Up", "matrix": [7, 4], "x": 14, "y": 3 },
-                { "label":"Ctrl", "matrix": [8, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label":"Win", "matrix": [8, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label":"Alt", "matrix": [8, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label":"Space", "matrix": [8, 3], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label":"MO(2)", "matrix": [8, 4], "w": 1.25, "x": 10, "y": 4 },
-                { "label":"MO(1)", "matrix": [8, 5], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label":"Left", "matrix": [8, 6], "x": 13, "y": 4 },
-                { "label":"Down", "matrix": [8, 7], "x": 14, "y": 4 },
-                { "label":"Right", "matrix": [7, 5], "x": 15, "y": 4 }
+                {"label": "ESC", "matrix": [0, 1], "x": 0, "y": 0},
+                {"label": "1!", "matrix": [0, 2], "x": 1, "y": 0},
+                {"label": "2@", "matrix": [0, 3], "x": 2, "y": 0},
+                {"label": "3#", "matrix": [0, 4], "x": 3, "y": 0},
+                {"label": "4$", "matrix": [0, 5], "x": 4, "y": 0},
+                {"label": "5%", "matrix": [0, 6], "x": 5, "y": 0},
+                {"label": "6^", "matrix": [0, 7], "x": 6, "y": 0},
+                {"label": "7&", "matrix": [0, 8], "x": 7, "y": 0},
+                {"label": "8*", "matrix": [1, 0], "x": 8, "y": 0},
+                {"label": "9(", "matrix": [1, 2], "x": 9, "y": 0},
+                {"label": "0)", "matrix": [1, 3], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [1, 4], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [3, 4], "x": 11.5, "y": 1},
+                {"label": "]}", "matrix": [3, 5], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [3, 6], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [4, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [4, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [4, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [5, 0], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 1], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [5, 2], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [5, 3], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 4], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [6, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [6, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [6, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [7, 0], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [7, 1], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [7, 2], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [7, 3], "w": 1.25, "x": 12.25, "y": 3},
+                {"label": "Up", "matrix": [7, 4], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [8, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [8, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [8, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [8, 3], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "MO(2)", "matrix": [8, 4], "w": 1.25, "x": 10, "y": 4},
+                {"label": "MO(1)", "matrix": [8, 5], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Left", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [8, 7], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [7, 5], "x": 15, "y": 4}
             ]
         }
     }

keyboards/gray_studio/aero75/info.json

@@ -2,7 +2,7 @@
     "keyboard_name": "Aero 75",
     "url": "https://graystudio.site/en/aero75/",
     "maintainer": "edwardslau",
-    "manufacturer":"GrayStudio",
+    "manufacturer": "GrayStudio",
     "usb": {
         "vid": "0x4753",
         "pid": "0x3075",

keyboards/gray_studio/space65r3/info.json

@@ -2,10 +2,10 @@
     "keyboard_name": "Space65R3",
     "url": "https://graystudio.site/en/works/space65r3/",
     "maintainer": "edwardslau",
-    "manufacturer":"GrayStudio",
+    "manufacturer": "GrayStudio",
     "usb": {
-        "vid":"0x4753",
-        "pid":"0x3003",
+        "vid": "0x4753",
+        "pid": "0x3003",
         "device_version": "0.0.3",
     },
     "ws2812": {

keyboards/handwired/10k/info.json

@@ -31,17 +31,17 @@
   "layouts": {
     "LAYOUT_split_1x5": {
       "layout": [
-        {"matrix": [0, 0], "x":0, "y":0.25},
-        {"matrix": [0, 1], "x":1, "y":0.125},
-        {"matrix": [0, 2], "x":2, "y":0},
-        {"matrix": [0, 3], "x":3, "y":0.5},
-        {"matrix": [0, 4], "x":3.75, "y":2.75},
+        {"matrix": [0, 0], "x": 0, "y": 0.25},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.5},
+        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
 
-        {"matrix": [1, 0], "x":5.75, "y":2.75},
-        {"matrix": [1, 1], "x":6.5, "y":0.5},
-        {"matrix": [1, 2], "x":7.5, "y":0},
-        {"matrix": [1, 3], "x":8.5, "y":0.125},
-        {"matrix": [1, 4], "x":9.5, "y":0.25}
+        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+        {"matrix": [1, 2], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
       ]
     }
   }

keyboards/handwired/aball/info.json

@@ -18,7 +18,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         }
     }

keyboards/handwired/alcor_dactyl/info.json

@@ -29,8 +29,8 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"x":0, "y":0.375},
-            {"x":16.5, "y":0.38}
+            {"x": 0, "y": 0.375},
+            {"x": 16.5, "y": 0.38}
         ]
     },
     "ws2812": {
@@ -38,96 +38,96 @@
         "driver": "vendor"
     },
     "layouts": {
-        "LAYOUT":{
-            "layout":[
-                {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0},
-                {"matrix":[0, 3], "x":3.5, "y":0.125},
-                {"matrix":[0, 4], "x":4.5, "y":0.125},
-                {"matrix":[0, 5], "x":5.5, "y":0.125},
-                {"matrix":[0, 6], "x":6.5, "y":0.125},
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.125},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.125},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.125},
 
-                {"matrix":[6, 6], "x":10.5, "y":0.125},
-                {"matrix":[6, 5], "x":11.5, "y":0.125},
-                {"matrix":[6, 4], "x":12.5, "y":0.125},
-                {"matrix":[6, 3], "x":13.5, "y":0.125},
-                {"matrix":[6, 2], "x":14.5, "y":0},
-                {"matrix":[6, 1], "x":15.5, "y":0.25},
-                {"matrix":[6, 0], "x":16.5, "y":0.25, "w":1.5},
+                {"matrix": [6, 6], "x": 10.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 4], "x": 12.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 2], "x": 14.5, "y": 0},
+                {"matrix": [6, 1], "x": 15.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 16.5, "y": 0.25, "w": 1.5},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1.125},
-                {"matrix":[1, 4], "x":4.5, "y":1.125},
-                {"matrix":[1, 5], "x":5.5, "y":1.125},
-                {"matrix":[1, 6], "x":6.5, "y":1.125},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.125},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.125},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.125},
 
-                {"matrix":[7, 6], "x":10.5, "y":1.125},
-                {"matrix":[7, 5], "x":11.5, "y":1.125},
-                {"matrix":[7, 4], "x":12.5, "y":1.125},
-                {"matrix":[7, 3], "x":13.5, "y":1.125},
-                {"matrix":[7, 2], "x":14.5, "y":1},
-                {"matrix":[7, 1], "x":15.5, "y":1.25},
-                {"matrix":[7, 0], "x":16.5, "y":1.25, "w":1.5},
+                {"matrix": [7, 6], "x": 10.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 4], "x": 12.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 2], "x": 14.5, "y": 1},
+                {"matrix": [7, 1], "x": 15.5, "y": 1.25},
+                {"matrix": [7, 0], "x": 16.5, "y": 1.25, "w": 1.5},
 
-                {"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},
-                {"matrix":[2, 3], "x":3.5, "y":2.125},
-                {"matrix":[2, 4], "x":4.5, "y":2.125},
-                {"matrix":[2, 5], "x":5.5, "y":2.125},
-                {"matrix":[2, 6], "x":6.5, "y":2.125},
+                {"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},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.125},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.125},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.125},
 
-                {"matrix":[8, 6], "x":10.5, "y":2.125},
-                {"matrix":[8, 5], "x":11.5, "y":2.125},
-                {"matrix":[8, 4], "x":12.5, "y":2.125},
-                {"matrix":[8, 3], "x":13.5, "y":2.125},
-                {"matrix":[8, 2], "x":14.5, "y":2},
-                {"matrix":[8, 1], "x":15.5, "y":2.25},
-                {"matrix":[8, 0], "x":16.5, "y":2.25, "w":1.5},
+                {"matrix": [8, 6], "x": 10.5, "y": 2.125},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 14.5, "y": 2},
+                {"matrix": [8, 1], "x": 15.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 16.5, "y": 2.25, "w": 1.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.5},
-                {"matrix":[3, 1], "x":1.5, "y":3.25},
-                {"matrix":[3, 2], "x":2.5, "y":3},
-                {"matrix":[3, 3], "x":3.5, "y":3.125},
-                {"matrix":[3, 4], "x":4.5, "y":3.125},
-                {"matrix":[3, 5], "x":5.5, "y":3.125},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.125},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.125},
 
-                {"matrix":[9, 5], "x":11.5, "y":3.125},
-                {"matrix":[9, 4], "x":12.5, "y":3.125},
-                {"matrix":[9, 3], "x":13.5, "y":3.125},
-                {"matrix":[9, 2], "x":14.5, "y":3},
-                {"matrix":[9, 1], "x":15.5, "y":3.25},
-                {"matrix":[9, 0], "x":16.5, "y":3.25, "w":1.5},
+                {"matrix": [9, 5], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 4], "x": 12.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 2], "x": 14.5, "y": 3},
+                {"matrix": [9, 1], "x": 15.5, "y": 3.25},
+                {"matrix": [9, 0], "x": 16.5, "y": 3.25, "w": 1.5},
 
-                {"matrix":[4, 0], "x":0.5, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25},
-                {"matrix":[4, 2], "x":2.5, "y":4},
-                {"matrix":[4, 3], "x":3.5, "y":4.125},
+                {"matrix": [4, 0], "x": 0.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.125},
 
-                {"matrix":[10, 3], "x":13.5, "y":4.125},
-                {"matrix":[10, 2], "x":14.5, "y":4},
-                {"matrix":[10, 1], "x":15.5, "y":4.25},
-                {"matrix":[10, 0], "x":16.5, "y":4.25},
+                {"matrix": [10, 3], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 2], "x": 14.5, "y": 4},
+                {"matrix": [10, 1], "x": 15.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 16.5, "y": 4.25},
 
-                {"matrix":[4, 4], "x":5, "y":4.375, "h":2},
-                {"matrix":[4, 5], "x":6.25, "y":4.375, "h":1.5},
-                {"matrix":[10, 5], "x":10.75, "y":4.375, "h":1.5},
-                {"matrix":[10, 4], "x":12, "y":4.375, "h":2},
+                {"matrix": [4, 4], "x": 5, "y": 4.375, "h": 2},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 5], "x": 10.75, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 4], "x": 12, "y": 4.375, "h": 2},
 
-                {"matrix":[5, 4], "x":6.25, "y":6.125},
-                {"matrix":[5, 5], "x":7.5, "y":6.125},
+                {"matrix": [5, 4], "x": 6.25, "y": 6.125},
+                {"matrix": [5, 5], "x": 7.5, "y": 6.125},
 
-                {"matrix":[11, 5], "x":9.5, "y":6.125},
-                {"matrix":[11, 4], "x":10.75, "y":6.125},
+                {"matrix": [11, 5], "x": 9.5, "y": 6.125},
+                {"matrix": [11, 4], "x": 10.75, "y": 6.125},
 
-                {"matrix":[5, 2], "x":6.25, "y":7.125},
-                {"matrix":[5, 3], "x":7.25, "y":7.125},
+                {"matrix": [5, 2], "x": 6.25, "y": 7.125},
+                {"matrix": [5, 3], "x": 7.25, "y": 7.125},
 
-                {"matrix":[11, 3], "x":9.75, "y":7.125},
-                {"matrix":[11, 2], "x":10.75, "y":7.125}
+                {"matrix": [11, 3], "x": 9.75, "y": 7.125},
+                {"matrix": [11, 2], "x": 10.75, "y": 7.125}
             ]
         }
     }

keyboards/handwired/baredev/rev1/info.json

@@ -8,30 +8,8 @@
         "term": 175
     },
     "matrix_pins": {
-        "cols": [
-            "B6",
-            "B7",
-            "C6",
-            "C7",
-            "D0",
-            "D1",
-            "D2",
-            "D3",
-            "D4",
-            "D5",
-            "D6",
-            "D7",
-            "E6",
-            "F0"
-        ],
-        "rows": [
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "B4",
-            "B5"
-        ]
+        "cols": ["B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
     },
     "usb": {
         "vid": "0x1209",
@@ -65,633 +43,83 @@
     "layouts": {
         "LAYOUT_abnt2": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        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.5,
-                    "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": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 13,
-                    "y": 1.25,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 13.75,
-                    "y": 2.25,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 12.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 1.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 13.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,
-                        6
-                    ],
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 12.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 13.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        13
-                    ],
-                    "x": 14.25,
-                    "y": 5.25
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 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.5, "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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25}
             ]
         }
     }

keyboards/handwired/bdn9_ble/info.json

@@ -24,15 +24,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/handwired/bento/rev1/info.json

@@ -27,12 +27,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }

keyboards/handwired/dactylmacropad/info.json

@@ -11,7 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "encoder":true
+        "encoder": true
     },
     "matrix_pins": {
         "cols": ["F7", "B1", "B3", "B2", "B6"],
@@ -31,19 +31,19 @@
     "layouts": {
         "LAYOUT": {
             "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": [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": [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": [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": [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": [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}
             ]
         }
     }

keyboards/handwired/daskeyboard/daskeyboard4/info.json

@@ -46,111 +46,111 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label":"Esc", "matrix": [5, 16], "x": 0, "y": 0 },
-                { "label":"F1", "matrix": [2, 4], "x": 2, "y": 0 },
-                { "label":"F2", "matrix": [2, 5], "x": 3, "y": 0 },
-                { "label":"F3", "matrix": [3, 5], "x": 4, "y": 0 },
-                { "label":"F4", "matrix": [5, 5], "x": 5, "y": 0 },
-                { "label":"F5", "matrix": [0, 1], "x": 6.5, "y": 0 },
-                { "label":"F6", "matrix": [5, 8], "x": 7.5, "y": 0 },
-                { "label":"F7", "matrix": [3, 3], "x": 8.5, "y": 0 },
-                { "label":"F8", "matrix": [2, 3], "x": 9.5, "y": 0 },
-                { "label":"F9", "matrix": [2, 2], "x": 11, "y": 0 },
-                { "label":"F10", "matrix": [0, 2], "x": 12, "y": 0 },
-                { "label":"F11", "matrix": [5, 2], "x": 13, "y": 0 },
-                { "label":"F12", "matrix": [6, 2], "x": 14, "y": 0 },
-                { "label":"Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0 },
-                { "label":"Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0 },
-                { "label":"Pause", "matrix": [1, 1], "x": 17.25, "y": 0 },
-                { "label":"`", "matrix": [2, 16], "x": 0, "y": 1.25 },
-                { "label":"1", "matrix": [0, 16], "x": 1, "y": 1.25 },
-                { "label":"2", "matrix": [0, 4], "x": 2, "y": 1.25 },
-                { "label":"3", "matrix": [0, 5], "x": 3, "y": 1.25 },
-                { "label":"4", "matrix": [0, 6], "x": 4, "y": 1.25 },
-                { "label":"5", "matrix": [2, 6], "x": 5, "y": 1.25 },
-                { "label":"6", "matrix": [2, 7], "x": 6, "y": 1.25 },
-                { "label":"7", "matrix": [0, 7], "x": 7, "y": 1.25 },
-                { "label":"8", "matrix": [0, 8], "x": 8, "y": 1.25 },
-                { "label":"9", "matrix": [0, 3], "x": 9, "y": 1.25 },
-                { "label":"0", "matrix": [0, 9], "x": 10, "y": 1.25 },
-                { "label":"-", "matrix": [2, 9], "x": 11, "y": 1.25 },
-                { "label":"=", "matrix": [2, 8], "x": 12, "y": 1.25 },
-                { "label":"Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25 },
-                { "label":"Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25 },
-                { "label":"Home", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
-                { "label":"Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25 },
-                { "label":"Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25 },
-                { "label":"/", "matrix": [4, 11], "x": 19.5, "y": 1.25 },
-                { "label":"*", "matrix": [4, 14], "x": 20.5, "y": 1.25 },
-                { "label":"-", "matrix": [6, 14], "x": 21.5, "y": 1.25 },
-                { "label":"Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label":"Q", "matrix": [1, 16], "x": 1.5, "y": 2.25 },
-                { "label":"W", "matrix": [1, 4], "x": 2.5, "y": 2.25 },
-                { "label":"E", "matrix": [1, 5], "x": 3.5, "y": 2.25 },
-                { "label":"R", "matrix": [1, 6], "x": 4.5, "y": 2.25 },
-                { "label":"T", "matrix": [3, 6], "x": 5.5, "y": 2.25 },
-                { "label":"Y", "matrix": [3, 7], "x": 6.5, "y": 2.25 },
-                { "label":"U", "matrix": [1, 7], "x": 7.5, "y": 2.25 },
-                { "label":"I", "matrix": [1, 8], "x": 8.5, "y": 2.25 },
-                { "label":"O", "matrix": [1, 3], "x": 9.5, "y": 2.25 },
-                { "label":"P", "matrix": [1, 9], "x": 10.5, "y": 2.25 },
-                { "label":"[", "matrix": [3, 9], "x": 11.5, "y": 2.25 },
-                { "label":"]", "matrix": [3, 8], "x": 12.5, "y": 2.25 },
-                { "label":"Del", "matrix": [2, 10], "x": 15.25, "y": 2.25 },
-                { "label":"End", "matrix": [0, 15], "x": 16.25, "y": 2.25 },
-                { "label":"Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25 },
-                { "label":"7", "matrix": [1, 10], "x": 18.5, "y": 2.25 },
-                { "label":"8", "matrix": [1, 11], "x": 19.5, "y": 2.25 },
-                { "label":"9", "matrix": [1, 14], "x": 20.5, "y": 2.25 },
-                { "label":"+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25 },
-                { "label":"Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label":"A", "matrix": [7, 16], "x": 1.75, "y": 3.25 },
-                { "label":"S", "matrix": [7, 4], "x": 2.75, "y": 3.25 },
-                { "label":"D", "matrix": [7, 5], "x": 3.75, "y": 3.25 },
-                { "label":"F", "matrix": [7, 6], "x": 4.75, "y": 3.25 },
-                { "label":"G", "matrix": [5, 6], "x": 5.75, "y": 3.25 },
-                { "label":"H", "matrix": [5, 7], "x": 6.75, "y": 3.25 },
-                { "label":"J", "matrix": [7, 7], "x": 7.75, "y": 3.25 },
-                { "label":"K", "matrix": [7, 8], "x": 8.75, "y": 3.25 },
-                { "label":"L", "matrix": [7, 3], "x": 9.75, "y": 3.25 },
-                { "label":";", "matrix": [7, 9], "x": 10.75, "y": 3.25 },
-                { "label":"'", "matrix": [5, 9], "x": 11.75, "y": 3.25 },
-                { "label":"#", "matrix": [1, 2], "x": 12.75, "y": 3.25 },
-                { "label":"Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25 },
-                { "label":"4", "matrix": [3, 10], "x": 18.5, "y": 3.25 },
-                { "label":"5", "matrix": [3, 11], "x": 19.5, "y": 3.25 },
-                { "label":"6", "matrix": [3, 14], "x": 20.5, "y": 3.25 },
-                { "label":"Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25 },
-                { "label":"\\", "matrix": [5, 4], "x": 1.25, "y": 4.25 },
-                { "label":"Z", "matrix": [4, 16], "x": 2.25, "y": 4.25 },
-                { "label":"X", "matrix": [4, 4], "x": 3.25, "y": 4.25 },
-                { "label":"C", "matrix": [4, 5], "x": 4.25, "y": 4.25 },
-                { "label":"V", "matrix": [4, 6], "x": 5.25, "y": 4.25 },
-                { "label":"B", "matrix": [6, 6], "x": 6.25, "y": 4.25 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 4.25 },
-                { "label":"M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label":",", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label":".", "matrix": [4, 3], "x": 10.25, "y": 4.25 },
-                { "label":"/", "matrix": [6, 9], "x": 11.25, "y": 4.25 },
-                { "label":"Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label":"Up", "matrix": [5, 15], "x": 16.25, "y": 4.25 },
-                { "label":"1", "matrix": [7, 10], "x": 18.5, "y": 4.25 },
-                { "label":"2", "matrix": [7, 11], "x": 19.5, "y": 4.25 },
-                { "label":"3", "matrix": [7, 14], "x": 20.5, "y": 4.25 },
-                { "label":"Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25 },
-                { "label":"Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label":"Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label":"Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label":" ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label":"Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label":"Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label":"Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label":"Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label":"Left", "matrix": [6, 15], "x": 15.25, "y": 5.25 },
-                { "label":"Down", "matrix": [6, 10], "x": 16.25, "y": 5.25 },
-                { "label":"Right", "matrix": [6, 11], "x": 17.25, "y": 5.25 },
-                { "label":"0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25 },
-                { "label":"Del", "matrix": [5, 14], "x": 20.5, "y": 5.25 }
+                {"label": "Esc", "matrix": [5, 16], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [2, 4], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [5, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 1], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [5, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [3, 3], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [2, 3], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [2, 2], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [5, 2], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 2], "x": 14, "y": 0},
+                {"label": "Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0},
+                {"label": "Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [1, 1], "x": 17.25, "y": 0},
+                {"label": "`", "matrix": [2, 16], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [0, 16], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [0, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [0, 5], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [0, 6], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [2, 6], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [2, 7], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [0, 3], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [0, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [2, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+                {"label": "Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25},
+                {"label": "Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25},
+                {"label": "/", "matrix": [4, 11], "x": 19.5, "y": 1.25},
+                {"label": "*", "matrix": [4, 14], "x": 20.5, "y": 1.25},
+                {"label": "-", "matrix": [6, 14], "x": 21.5, "y": 1.25},
+                {"label": "Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "Q", "matrix": [1, 16], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [3, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [3, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [1, 3], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [1, 9], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [3, 9], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [3, 8], "x": 12.5, "y": 2.25},
+                {"label": "Del", "matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [0, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25},
+                {"label": "7", "matrix": [1, 10], "x": 18.5, "y": 2.25},
+                {"label": "8", "matrix": [1, 11], "x": 19.5, "y": 2.25},
+                {"label": "9", "matrix": [1, 14], "x": 20.5, "y": 2.25},
+                {"label": "+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "A", "matrix": [7, 16], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [7, 4], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [7, 5], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [7, 6], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [7, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 9], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 9], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [1, 2], "x": 12.75, "y": 3.25},
+                {"label": "Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4", "matrix": [3, 10], "x": 18.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 11], "x": 19.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 14], "x": 20.5, "y": 3.25},
+                {"label": "Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "\\", "matrix": [5, 4], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 16], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 3], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [6, 9], "x": 11.25, "y": 4.25},
+                {"label": "Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "Up", "matrix": [5, 15], "x": 16.25, "y": 4.25},
+                {"label": "1", "matrix": [7, 10], "x": 18.5, "y": 4.25},
+                {"label": "2", "matrix": [7, 11], "x": 19.5, "y": 4.25},
+                {"label": "3", "matrix": [7, 14], "x": 20.5, "y": 4.25},
+                {"label": "Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25},
+                {"label": "Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+                {"label": "Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+                {"label": "Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+                {"label": " ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+                {"label": "Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+                {"label": "Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+                {"label": "Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+                {"label": "Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+                {"label": "Left", "matrix": [6, 15], "x": 15.25, "y": 5.25},
+                {"label": "Down", "matrix": [6, 10], "x": 16.25, "y": 5.25},
+                {"label": "Right", "matrix": [6, 11], "x": 17.25, "y": 5.25},
+                {"label": "0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+                {"label": "Del", "matrix": [5, 14], "x": 20.5, "y": 5.25}
             ]
         }
     }

keyboards/handwired/jscotto/scottocmd/info.json

@@ -14,19 +14,7 @@
     },
     "matrix_pins": {
         // TX0, RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1
-        "cols": [
-            "D3",
-            "D2",
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5",
-            "F4",
-            "F5",
-            "F6"
-        ],
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
         // A0, 15, 14, 16, 10
         "rows": ["F7", "B1", "B3", "B2", "B6"]
     },
@@ -44,54 +32,54 @@
         "LAYOUT_ortho_4_3x10_4": {
             "layout": [
                 // Row 1 (Macros)
-                { "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, 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},
 
                 // Row 2
-                { "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": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-                { "matrix": [1, 10], "x": 10, "y": 1 },
+                {"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": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
 
                 // Row 3
-                { "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": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-                { "matrix": [2, 10], "x": 10, "y": 2 },
+                {"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": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
 
                 // Row 4
-                { "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, 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},
 
                 // Row 5
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 5], "x": 5, "y": 4 },
-                { "matrix": [4, 9], "x": 9, "y": 4 },
-                { "matrix": [4, 10], "x": 10, "y": 4 }
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4}
             ]
         }
     }

keyboards/handwired/maverick0197/keydeck8/info.json

@@ -29,9 +29,17 @@
     "layouts": {
         "LAYOUT": {
         "layout": [
-                {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1},
-                {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2}
+                {"label": "D0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "D4", "matrix": [0, 2], "x": 2, "y": 0},
+
+                {"label": "C6", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D7", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "E6", "matrix": [1, 2], "x": 2, "y": 1},
+
+                {"label": "B4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "B5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "B6", "matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }

keyboards/handwired/myskeeb/info.json

@@ -27,85 +27,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
-                {"x":1.5, "y":0.75, "matrix": [0, 1]},
-                {"x":2.5, "y":0.25, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "matrix": [0, 3]},
-                {"x":4.5, "y":0.25, "matrix": [0, 4]},
-                {"x":5.5, "y":0.75, "matrix": [0, 5]},
-                {"x":6.5, "y":1, "matrix": [0, 6]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
 
-                {"x":9.5, "y":1, "matrix": [5, 0]},
-                {"x":10.5, "y":0.75, "matrix": [5, 1]},
-                {"x":11.5, "y":0.25, "matrix": [5, 2]},
-                {"x":12.5, "y":0, "matrix": [5, 3]},
-                {"x":13.5, "y":0.25, "matrix": [5, 4]},
-                {"x":14.5, "y":0.75, "matrix": [5, 5]},
-                {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
 
-                {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1.75, "matrix": [1, 1]},
-                {"x":2.5, "y":1.25, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1.25, "matrix": [1, 4]},
-                {"x":5.5, "y":1.75, "matrix": [1, 5]},
-                {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
 
-                {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
-                {"x":10.5, "y":1.75, "matrix": [6, 1]},
-                {"x":11.5, "y":1.25, "matrix": [6, 2]},
-                {"x":12.5, "y":1, "matrix": [6, 3]},
-                {"x":13.5, "y":1.25, "matrix": [6, 4]},
-                {"x":14.5, "y":1.75, "matrix": [6, 5]},
-                {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
 
-                {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.75, "matrix": [2, 1]},
-                {"x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"x":3.5, "y":2, "matrix": [2, 3]},
-                {"x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"x":5.5, "y":2.75, "matrix": [2, 5]},
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
 
-                {"x":10.5, "y":2.75, "matrix": [7, 1]},
-                {"x":11.5, "y":2.25, "matrix": [7, 2]},
-                {"x":12.5, "y":2, "matrix": [7, 3]},
-                {"x":13.5, "y":2.25, "matrix": [7, 4]},
-                {"x":14.5, "y":2.75, "matrix": [7, 5]},
-                {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
-                {"x":1.5, "y":3.75, "matrix": [3, 1]},
-                {"x":2.5, "y":3.25, "matrix": [3, 2]},
-                {"x":3.5, "y":3, "matrix": [3, 3]},
-                {"x":4.5, "y":3.25, "matrix": [3, 4]},
-                {"x":5.5, "y":3.75, "matrix": [3, 5]},
-                {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
 
-                {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
-                {"x":10.5, "y":3.75, "matrix": [8, 1]},
-                {"x":11.5, "y":3.25, "matrix": [8, 2]},
-                {"x":12.5, "y":3, "matrix": [8, 3]},
-                {"x":13.5, "y":3.25, "matrix": [8, 4]},
-                {"x":14.5, "y":3.75, "matrix": [8, 5]},
-                {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
 
-                {"x":0.25, "y":5, "matrix": [4, 0]},
-                {"x":1.5, "y":4.75, "matrix": [4, 1]},
-                {"x":2.5, "y":4.25, "matrix": [4, 2]},
-                {"x":3.5, "y":4, "matrix": [4, 3]},
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
 
-                {"x":5, "y":6, "matrix": [4, 4]},
-                {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
-                {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
 
-                {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
-                {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
-                {"x":11, "y":6, "matrix": [9, 2]},
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
 
-                {"x":12.5, "y":4, "matrix": [9, 3]},
-                {"x":13.5, "y":4.25, "matrix": [9, 4]},
-                {"x":14.5, "y":4.75, "matrix": [9, 5]},
-                {"x":15.75, "y":5, "matrix": [9, 6]}
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
             ]
         }
     }

keyboards/handwired/prime_exl_plus/info.json

@@ -21,98 +21,98 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":0, "y":0, "matrix": [4, 0]},
-            {"x":1, "y":0, "matrix": [5, 0]},
-            {"x":2, "y":0, "matrix": [4, 1]},
-            {"x":3, "y":0, "matrix": [5, 1]},
-            {"x":4, "y":0, "matrix": [4, 2]},
-            {"x":5, "y":0, "matrix": [5, 2]},
-            {"x":6.5, "y":0, "matrix": [4, 3]},
-            {"x":7.5, "y":0, "matrix": [5, 3]},
-            {"x":8.5, "y":0, "matrix": [4, 4]},
-            {"x":9.5, "y":0, "matrix": [5, 4]},
-            {"x":10.5, "y":0, "matrix": [4, 5]},
-            {"x":11.5, "y":0, "matrix": [5, 5]},
-            {"x":14, "y":0, "matrix": [4, 6]},
-            {"x":15, "y":0, "matrix": [5, 6]},
-            {"x":16, "y":0, "matrix": [4, 7]},
-            {"x":17, "y":0, "matrix": [5, 7]},
-            {"x":18, "y":0, "matrix": [4, 8]},
-            {"x":19, "y":0, "w":2, "matrix": [5, 8]},
+            {"x": 0, "y": 0, "matrix": [4, 0]},
+            {"x": 1, "y": 0, "matrix": [5, 0]},
+            {"x": 2, "y": 0, "matrix": [4, 1]},
+            {"x": 3, "y": 0, "matrix": [5, 1]},
+            {"x": 4, "y": 0, "matrix": [4, 2]},
+            {"x": 5, "y": 0, "matrix": [5, 2]},
+            {"x": 6.5, "y": 0, "matrix": [4, 3]},
+            {"x": 7.5, "y": 0, "matrix": [5, 3]},
+            {"x": 8.5, "y": 0, "matrix": [4, 4]},
+            {"x": 9.5, "y": 0, "matrix": [5, 4]},
+            {"x": 10.5, "y": 0, "matrix": [4, 5]},
+            {"x": 11.5, "y": 0, "matrix": [5, 5]},
+            {"x": 14, "y": 0, "matrix": [4, 6]},
+            {"x": 15, "y": 0, "matrix": [5, 6]},
+            {"x": 16, "y": 0, "matrix": [4, 7]},
+            {"x": 17, "y": 0, "matrix": [5, 7]},
+            {"x": 18, "y": 0, "matrix": [4, 8]},
+            {"x": 19, "y": 0, "w": 2, "matrix": [5, 8]},
 
-            {"x":0, "y":1, "matrix": [3, 0]},
-            {"x":1, "y":1, "matrix": [6, 0]},
-            {"x":2, "y":1, "matrix": [3, 1]},
-            {"x":3, "y":1, "matrix": [6, 1]},
-            {"x":4, "y":1, "matrix": [3, 2]},
-            {"x":5, "y":1, "matrix": [6, 2]},
-            {"x":6.5, "y":1, "matrix": [3, 3]},
-            {"x":7.5, "y":1, "matrix": [6, 3]},
-            {"x":8.5, "y":1, "matrix": [3, 4]},
-            {"x":9.5, "y":1, "matrix": [6, 4]},
-            {"x":10.5, "y":1, "matrix": [3, 5]},
-            {"x":11.5, "y":1, "matrix": [6, 5]},
-            {"x":14, "y":1, "matrix": [3, 6]},
-            {"x":15, "y":1, "matrix": [6, 6]},
-            {"x":16, "y":1, "matrix": [3, 7]},
-            {"x":17, "y":1, "matrix": [6, 7]},
-            {"x":18, "y":1, "matrix": [3, 8]},
-            {"x":19, "y":1, "matrix": [6, 8]},
-            {"x":20, "y":1, "matrix": [3, 9]},
+            {"x": 0, "y": 1, "matrix": [3, 0]},
+            {"x": 1, "y": 1, "matrix": [6, 0]},
+            {"x": 2, "y": 1, "matrix": [3, 1]},
+            {"x": 3, "y": 1, "matrix": [6, 1]},
+            {"x": 4, "y": 1, "matrix": [3, 2]},
+            {"x": 5, "y": 1, "matrix": [6, 2]},
+            {"x": 6.5, "y": 1, "matrix": [3, 3]},
+            {"x": 7.5, "y": 1, "matrix": [6, 3]},
+            {"x": 8.5, "y": 1, "matrix": [3, 4]},
+            {"x": 9.5, "y": 1, "matrix": [6, 4]},
+            {"x": 10.5, "y": 1, "matrix": [3, 5]},
+            {"x": 11.5, "y": 1, "matrix": [6, 5]},
+            {"x": 14, "y": 1, "matrix": [3, 6]},
+            {"x": 15, "y": 1, "matrix": [6, 6]},
+            {"x": 16, "y": 1, "matrix": [3, 7]},
+            {"x": 17, "y": 1, "matrix": [6, 7]},
+            {"x": 18, "y": 1, "matrix": [3, 8]},
+            {"x": 19, "y": 1, "matrix": [6, 8]},
+            {"x": 20, "y": 1, "matrix": [3, 9]},
 
-            {"x":0, "y":2, "matrix": [2, 0]},
-            {"x":1, "y":2, "matrix": [7, 0]},
-            {"x":2, "y":2, "matrix": [2, 1]},
-            {"x":3, "y":2, "matrix": [7, 1]},
-            {"x":4, "y":2, "matrix": [2, 2]},
-            {"x":5, "y":2, "matrix": [7, 2]},
-            {"x":6.5, "y":2, "w":1.25, "matrix": [2, 3]},
-            {"x":7.75, "y":2, "matrix": [7, 3]},
-            {"x":8.75, "y":2, "matrix": [2, 4]},
-            {"x":9.75, "y":2, "matrix": [7, 4]},
-            {"x":10.75, "y":2, "matrix": [2, 5]},
-            {"x":11.75, "y":2, "matrix": [7, 5]},
-            {"x":14.25, "y":2, "matrix": [2, 6]},
-            {"x":15.25, "y":2, "matrix": [7, 6]},
-            {"x":16.25, "y":2, "matrix": [2, 7]},
-            {"x":17.25, "y":2, "matrix": [7, 7]},
-            {"x":18.25, "y":2, "matrix": [2, 8]},
-            {"x":19.25, "y":2, "w":1.75, "matrix": [2, 9]},
+            {"x": 0, "y": 2, "matrix": [2, 0]},
+            {"x": 1, "y": 2, "matrix": [7, 0]},
+            {"x": 2, "y": 2, "matrix": [2, 1]},
+            {"x": 3, "y": 2, "matrix": [7, 1]},
+            {"x": 4, "y": 2, "matrix": [2, 2]},
+            {"x": 5, "y": 2, "matrix": [7, 2]},
+            {"x": 6.5, "y": 2, "w": 1.25, "matrix": [2, 3]},
+            {"x": 7.75, "y": 2, "matrix": [7, 3]},
+            {"x": 8.75, "y": 2, "matrix": [2, 4]},
+            {"x": 9.75, "y": 2, "matrix": [7, 4]},
+            {"x": 10.75, "y": 2, "matrix": [2, 5]},
+            {"x": 11.75, "y": 2, "matrix": [7, 5]},
+            {"x": 14.25, "y": 2, "matrix": [2, 6]},
+            {"x": 15.25, "y": 2, "matrix": [7, 6]},
+            {"x": 16.25, "y": 2, "matrix": [2, 7]},
+            {"x": 17.25, "y": 2, "matrix": [7, 7]},
+            {"x": 18.25, "y": 2, "matrix": [2, 8]},
+            {"x": 19.25, "y": 2, "w": 1.75, "matrix": [2, 9]},
 
-            {"x":0, "y":3, "matrix": [1, 0]},
-            {"x":1, "y":3, "matrix": [8, 0]},
-            {"x":2, "y":3, "matrix": [1, 1]},
-            {"x":3, "y":3, "matrix": [8, 1]},
-            {"x":4, "y":3, "matrix": [1, 2]},
-            {"x":5, "y":3, "matrix": [8, 2]},
-            {"x":6.5, "y":3, "w":1.75, "matrix": [1, 3]},
-            {"x":8.25, "y":3, "matrix": [8, 3]},
-            {"x":9.25, "y":3, "matrix": [1, 4]},
-            {"x":10.25, "y":3, "matrix": [8, 4]},
-            {"x":11.25, "y":3, "matrix": [1, 5]},
-            {"x":12.25, "y":3, "matrix": [8, 5]},
-            {"x":13.75, "y":3, "matrix": [1, 6]},
-            {"x":14.75, "y":3, "matrix": [8, 6]},
-            {"x":15.75, "y":3, "matrix": [1, 7]},
-            {"x":16.75, "y":3, "matrix": [8, 7]},
-            {"x":17.75, "y":3, "matrix": [1, 8]},
-            {"x":18.75, "y":3, "matrix": [8, 8]},
-            {"x":19.75, "y":3, "w":1.25, "matrix": [1, 9]},
+            {"x": 0, "y": 3, "matrix": [1, 0]},
+            {"x": 1, "y": 3, "matrix": [8, 0]},
+            {"x": 2, "y": 3, "matrix": [1, 1]},
+            {"x": 3, "y": 3, "matrix": [8, 1]},
+            {"x": 4, "y": 3, "matrix": [1, 2]},
+            {"x": 5, "y": 3, "matrix": [8, 2]},
+            {"x": 6.5, "y": 3, "w": 1.75, "matrix": [1, 3]},
+            {"x": 8.25, "y": 3, "matrix": [8, 3]},
+            {"x": 9.25, "y": 3, "matrix": [1, 4]},
+            {"x": 10.25, "y": 3, "matrix": [8, 4]},
+            {"x": 11.25, "y": 3, "matrix": [1, 5]},
+            {"x": 12.25, "y": 3, "matrix": [8, 5]},
+            {"x": 13.75, "y": 3, "matrix": [1, 6]},
+            {"x": 14.75, "y": 3, "matrix": [8, 6]},
+            {"x": 15.75, "y": 3, "matrix": [1, 7]},
+            {"x": 16.75, "y": 3, "matrix": [8, 7]},
+            {"x": 17.75, "y": 3, "matrix": [1, 8]},
+            {"x": 18.75, "y": 3, "matrix": [8, 8]},
+            {"x": 19.75, "y": 3, "w": 1.25, "matrix": [1, 9]},
 
-            {"x":0, "y":4, "matrix": [0, 0]},
-            {"x":1, "y":4, "matrix": [9, 0]},
-            {"x":2, "y":4, "matrix": [0, 1]},
-            {"x":3, "y":4, "matrix": [9, 1]},
-            {"x":4, "y":4, "matrix": [0, 2]},
-            {"x":5, "y":4, "matrix": [9, 2]},
-            {"x":6.5, "y":4, "w":1.25, "matrix": [0, 3]},
-            {"x":7.75, "y":4, "w":1.25, "matrix": [9, 3]},
-            {"x":10.25, "y":4, "w":1.25, "matrix": [0, 4]},
-            {"x":11.5, "y":4, "w":1.75, "matrix": [9, 5]},
-            {"x":13.75, "y":4, "w":1.75, "matrix": [0, 6]},
-            {"x":15.5, "y":4, "w":1.25, "matrix": [9, 7]},
-            {"x":18.5, "y":4, "w":1.25, "matrix": [9, 8]},
-            {"x":19.75, "y":4, "w":1.25, "matrix": [0, 9]}
+            {"x": 0, "y": 4, "matrix": [0, 0]},
+            {"x": 1, "y": 4, "matrix": [9, 0]},
+            {"x": 2, "y": 4, "matrix": [0, 1]},
+            {"x": 3, "y": 4, "matrix": [9, 1]},
+            {"x": 4, "y": 4, "matrix": [0, 2]},
+            {"x": 5, "y": 4, "matrix": [9, 2]},
+            {"x": 6.5, "y": 4, "w": 1.25, "matrix": [0, 3]},
+            {"x": 7.75, "y": 4, "w": 1.25, "matrix": [9, 3]},
+            {"x": 10.25, "y": 4, "w": 1.25, "matrix": [0, 4]},
+            {"x": 11.5, "y": 4, "w": 1.75, "matrix": [9, 5]},
+            {"x": 13.75, "y": 4, "w": 1.75, "matrix": [0, 6]},
+            {"x": 15.5, "y": 4, "w": 1.25, "matrix": [9, 7]},
+            {"x": 18.5, "y": 4, "w": 1.25, "matrix": [9, 8]},
+            {"x": 19.75, "y": 4, "w": 1.25, "matrix": [0, 9]}
           ]
       }
   }

keyboards/handwired/split89/info.json

@@ -27,95 +27,95 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                    {"label":"Esc", "matrix": [0, 4], "x":0, "y":0},
-                    {"label":"F1", "matrix": [0, 5], "x":2, "y":0},
-                    {"label":"F2", "matrix": [0, 6], "x":3, "y":0},
-                    {"label":"F3", "matrix": [0, 7], "x":4, "y":0},
-                    {"label":"F4", "matrix": [0, 8], "x":5, "y":0},
-                    {"label":"F5", "matrix": [0, 9], "x":6, "y":0},
-                    {"label":"F6", "matrix": [6, 0], "x":10.25, "y":0},
-                    {"label":"F7", "matrix": [6, 1], "x":11.25, "y":0},
-                    {"label":"F8", "matrix": [6, 2], "x":12.25, "y":0},
-                    {"label":"F9", "matrix": [6, 3], "x":13.75, "y":0},
-                    {"label":"F10", "matrix": [6, 4], "x":14.75, "y":0},
-                    {"label":"F11", "matrix": [6, 5], "x":15.75, "y":0},
-                    {"label":"F12", "matrix": [6, 6], "x":16.75, "y":0},
-                    {"label":"PrtSc", "matrix": [6, 7], "x":18, "y":0},
-                    {"label":"Scroll Lock", "matrix": [6, 8], "x":19, "y":0},
-                    {"label":"Pause", "matrix": [6, 9], "x":20, "y":0},
-                    {"label":"~", "matrix": [2, 4], "x":0, "y":1.5},
-                    {"label":"1!", "matrix": [1, 4], "x":1, "y":1.5},
-                    {"label":"2@", "matrix": [1, 5], "x":2, "y":1.5},
-                    {"label":"3#", "matrix": [1, 6], "x":3, "y":1.5},
-                    {"label":"4$", "matrix": [1, 7], "x":4, "y":1.5},
-                    {"label":"5%", "matrix": [1, 8], "x":5, "y":1.5},
-                    {"label":"6^", "matrix": [1, 9], "x":6, "y":1.5},
-                    {"label":"7&", "matrix": [7, 0], "x":9.75, "y":1.5},
-                    {"label":"8*", "matrix": [7, 1], "x":10.75, "y":1.5},
-                    {"label":"9(", "matrix": [7, 2], "x":11.75, "y":1.5},
-                    {"label":"0)", "matrix": [7, 3], "x":12.75, "y":1.5},
-                    {"label":"-_", "matrix": [7, 4], "x":13.75, "y":1.5},
-                    {"label":"=+", "matrix": [7, 5], "x":14.75, "y":1.5},
-                    {"label":"Backspace", "matrix": [7, 6], "x":15.75, "y":1.5, "w":2},
-                    {"label":"Insert", "matrix": [7, 7], "x":18, "y":1.5},
-                    {"label":"Home", "matrix": [7, 8], "x":19, "y":1.5},
-                    {"label":"PgUp", "matrix": [7, 9], "x":20, "y":1.5},
-                    {"label":"Tab", "matrix": [3, 4], "x":0, "y":2.5, "w":1.5},
-                    {"label":"Q", "matrix": [2, 5], "x":1.5, "y":2.5},
-                    {"label":"W", "matrix": [2, 6], "x":2.5, "y":2.5},
-                    {"label":"E", "matrix": [2, 7], "x":3.5, "y":2.5},
-                    {"label":"R", "matrix": [2, 8], "x":4.5, "y":2.5},
-                    {"label":"T", "matrix": [2, 9], "x":5.5, "y":2.5},
-                    {"label":"Y", "matrix": [9, 0], "x":9.25, "y":2.5},
-                    {"label":"U", "matrix": [8, 0], "x":10.25, "y":2.5},
-                    {"label":"I", "matrix": [8, 1], "x":11.25, "y":2.5},
-                    {"label":"O", "matrix": [8, 2], "x":12.25, "y":2.5},
-                    {"label":"P", "matrix": [8, 3], "x":13.25, "y":2.5},
-                    {"label":"{", "matrix": [8, 4], "x":14.25, "y":2.5},
-                    {"label":"}", "matrix": [8, 5], "x":15.25, "y":2.5},
-                    {"label":"|", "matrix": [8, 6], "x":16.25, "y":2.5, "w":1.5},
-                    {"label":"Delete", "matrix": [8, 7], "x":18, "y":2.5},
-                    {"label":"End", "matrix": [8, 8], "x":19, "y":2.5},
-                    {"label":"PgDn", "matrix": [8, 9], "x":20, "y":2.5},
-                    {"label":"Caps Lock", "matrix": [4, 4], "x":0, "y":3.5, "w":1.75},
-                    {"label":"A", "matrix": [3, 5], "x":1.75, "y":3.5},
-                    {"label":"S", "matrix": [3, 6], "x":2.75, "y":3.5},
-                    {"label":"D", "matrix": [3, 7], "x":3.75, "y":3.5},
-                    {"label":"F", "matrix": [3, 8], "x":4.75, "y":3.5},
-                    {"label":"G", "matrix": [3, 9], "x":5.75, "y":3.5},
-                    {"label":"H", "matrix": [10, 0], "x":9.5, "y":3.5},
-                    {"label":"J", "matrix": [9, 1], "x":10.5, "y":3.5},
-                    {"label":"K", "matrix": [9, 2], "x":11.5, "y":3.5},
-                    {"label":"L", "matrix": [9, 3], "x":12.5, "y":3.5},
-                    {"label":":", "matrix": [9, 4], "x":13.5, "y":3.5},
-                    {"label":"\"", "matrix": [9, 5], "x":14.5, "y":3.5},
-                    {"label":"Enter", "matrix": [9, 6], "x":15.5, "y":3.5, "w":2.25},
-                    {"label":"Shift", "matrix": [5, 4], "x":0, "y":4.5, "w":2.25},
-                    {"label":"Z", "matrix": [4, 5], "x":2.25, "y":4.5},
-                    {"label":"X", "matrix": [4, 6], "x":3.25, "y":4.5},
-                    {"label":"C", "matrix": [4, 7], "x":4.25, "y":4.5},
-                    {"label":"V", "matrix": [4, 8], "x":5.25, "y":4.5},
-                    {"label":"B", "matrix": [4, 9], "x":6.25, "y":4.5},
-                    {"label":"N", "matrix": [11, 0], "x":10, "y":4.5},
-                    {"label":"M", "matrix": [10, 1], "x":11, "y":4.5},
-                    {"label":"<", "matrix": [10, 2], "x":12, "y":4.5},
-                    {"label":">", "matrix": [10, 3], "x":13, "y":4.5},
-                    {"label":"?", "matrix": [10, 4], "x":14, "y":4.5},
-                    {"label":"Shift", "matrix": [10, 6], "x":15, "y":4.5, "w":2.75},
-                    {"label":"\u2191", "matrix": [10, 8], "x":19, "y":4.5},
-                    {"label":"Ctrl", "matrix": [5, 5], "x":0, "y":5.5, "w":1.25},
-                    {"label":"Fn", "matrix": [5, 6], "x":1.25, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [5, 7], "x":2.5, "y":5.5, "w":1.25},
-                    {"label":"Alt", "matrix": [5, 8], "x":3.75, "y":5.5, "w":1.25},
-                    {"label":"Space", "matrix": [5, 9], "x":5, "y":5.5, "w":2.25},
-                    {"label":"Space", "matrix": [11, 1], "x":10, "y":5.5, "w":2.75},
-                    {"label":"Alt", "matrix": [11, 3], "x":12.75, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [11, 4], "x":14, "y":5.5, "w":1.25},
-                    {"label":"Menu", "matrix": [11, 5], "x":15.25, "y":5.5, "w":1.25},
-                    {"label":"Ctrl", "matrix": [11, 6], "x":16.5, "y":5.5, "w":1.25},
-                    {"label":"\u2190", "matrix": [11, 7], "x":18, "y":5.5},
-                    {"label":"\u2193", "matrix": [11, 8], "x":19, "y":5.5},
-                    {"label":"\u2192", "matrix": [11, 9], "x":20, "y":5.5}
+                    {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
+                    {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
+                    {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
+                    {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
+                    {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
+                    {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
+                    {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
+                    {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
+                    {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
+                    {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
+                    {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
+                    {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
+                    {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
+                    {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
+                    {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
+                    {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
+                    {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
+                    {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
+                    {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
+                    {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
+                    {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
+                    {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
+                    {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
+                    {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
+                    {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
+                    {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
+                    {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
+                    {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
+                    {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
+                    {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
+                    {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
+                    {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
+                    {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
+                    {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
+                    {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
+                    {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
+                    {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
+                    {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
+                    {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
+                    {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
+                    {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
+                    {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
+                    {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
+                    {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
+                    {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
+                    {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
+                    {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
+                    {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
+                    {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
+                    {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
+                    {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
+                    {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
+                    {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
+                    {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
+                    {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
+                    {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
+                    {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
+                    {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+                    {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
+                    {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
+                    {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
+                    {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
+                    {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
+                    {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
+                    {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
+                    {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
+                    {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
+                    {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
+                    {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
+                    {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
+                    {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
+                    {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
+                    {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
+                    {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
+                    {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
+                    {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
+                    {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
+                    {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
+                    {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
+                    {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
+                    {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
+                    {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
+                    {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
+                    {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
+                    {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
+                    {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
+                    {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
                     ]
         }
     }

keyboards/handwired/stream_cheap/2x3/info.json

@@ -20,12 +20,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }

keyboards/handwired/stream_cheap/2x4/info.json

@@ -19,14 +19,14 @@
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [
-                {"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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]}
+                {"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": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
             ]
         }
     }

keyboards/handwired/stream_cheap/2x5/info.json

@@ -19,16 +19,16 @@
     "layouts": {
         "LAYOUT_ortho_2x5": {
             "layout": [
-                {"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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]}
+                {"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": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]}
             ]
         }
     }

keyboards/hineybush/ibis/info.json

@@ -13,30 +13,8 @@
         "nkro": true
     },
     "matrix_pins": {
-        "cols": [
-            "F0",
-            "F1",
-            "F4",
-            "F5",
-            "F6",
-            "F7",
-            "B6",
-            "B5",
-            "D6",
-            "D4"
-        ],
-        "rows": [
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "C7",
-            "C6",
-            "B4",
-            "D7",
-            "D5",
-            "D3"
-        ]
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D6", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "C7", "C6", "B4", "D7", "D5", "D3"]
     },
     "processor": "atmega32u4",
     "url": "",
@@ -52,290 +30,290 @@
     "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": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"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": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [4, 6], "x":12.75, "y":2},
-                {"matrix": [5, 6], "x":13.75, "y":2, "w":1.25},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
-                {"matrix": [7, 0], "x":1.25, "y":3},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_ansi_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": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"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": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [5, 6], "x":12.75, "y":2, "w":2.25},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":2.25},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_iso_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": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"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": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [4, 6], "x":12.75, "y":2},
-                {"matrix": [5, 6], "x":13.75, "y":1, "w":1.25, "h":2},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
-                {"matrix": [7, 0], "x":1.25, "y":3},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         }
     }

keyboards/ibm/model_m_4th_gen/info.json

@@ -10,2551 +10,326 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        15
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 6
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [4, 6], "x": 13, "y": 1.5},
+                {"matrix": [1, 6], "x": 14, "y": 1.5},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 11], "x": 21.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 15], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 12.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 15], "x": 4, "y": 5.5},
+                {"matrix": [7, 6], "x": 5, "y": 5.5, "w": 6},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 8], "x": 18.5, "y": 5.5},
+                {"matrix": [0, 9], "x": 19.5, "y": 5.5},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 9], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 15], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 9], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5}
             ]
         }
     }

keyboards/idobao/id61/info.json

@@ -35,71 +35,71 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x":0, "y":0 },
-                { "label": "1!", "matrix": [0, 1], "x":1, "y":0 },
-                { "label": "2@", "matrix": [0, 2], "x":2, "y":0 },
-                { "label": "3#", "matrix": [0, 3], "x":3, "y":0 },
-                { "label": "4$", "matrix": [0, 4], "x":4, "y":0 },
-                { "label": "5%", "matrix": [0, 5], "x":5, "y":0 },
-                { "label": "6^", "matrix": [0, 6], "x":6, "y":0 },
-                { "label": "7&", "matrix": [0, 7], "x":7, "y":0 },
-                { "label": "8*", "matrix": [0, 8], "x":8, "y":0 },
-                { "label": "9(", "matrix": [0, 9], "x":9, "y":0 },
-                { "label": "0)", "matrix": [0, 10], "x":10, "y":0 },
-                { "label": "-_", "matrix": [0, 11], "x":11, "y":0 },
-                { "label": "=+", "matrix": [0, 12], "x":12, "y":0 },
-                { "label": "Backspace", "matrix": [0, 13], "x":13, "y":0, "w":2 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                { "label": "Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "label": "Q", "matrix": [1, 1], "x":1.5, "y":1 },
-                { "label": "W", "matrix": [1, 2], "x":2.5, "y":1 },
-                { "label": "E", "matrix": [1, 3], "x":3.5, "y":1 },
-                { "label": "R", "matrix": [1, 4], "x":4.5, "y":1 },
-                { "label": "T", "matrix": [1, 5], "x":5.5, "y":1 },
-                { "label": "Y", "matrix": [1, 6], "x":6.5, "y":1 },
-                { "label": "U", "matrix": [1, 7], "x":7.5, "y":1 },
-                { "label": "I", "matrix": [1, 8], "x":8.5, "y":1 },
-                { "label": "O", "matrix": [1, 9], "x":9.5, "y":1 },
-                { "label": "P", "matrix": [1, 10], "x":10.5, "y":1 },
-                { "label": "[{", "matrix": [1, 11], "x":11.5, "y":1 },
-                { "label": "]}", "matrix": [1, 12], "x":12.5, "y":1 },
-                { "label": "\\|", "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "label": "A", "matrix": [2, 1], "x":1.75, "y":2 },
-                { "label": "S", "matrix": [2, 2], "x":2.75, "y":2 },
-                { "label": "D", "matrix": [2, 3], "x":3.75, "y":2 },
-                { "label": "F", "matrix": [2, 4], "x":4.75, "y":2 },
-                { "label": "G", "matrix": [2, 5], "x":5.75, "y":2 },
-                { "label": "H", "matrix": [2, 6], "x":6.75, "y":2 },
-                { "label": "J", "matrix": [2, 7], "x":7.75, "y":2 },
-                { "label": "K", "matrix": [2, 8], "x":8.75, "y":2 },
-                { "label": "L", "matrix": [2, 9], "x":9.75, "y":2 },
-                { "label": ";:", "matrix": [2, 10], "x":10.75, "y":2 },
-                { "label": "'\"", "matrix": [2, 11], "x":11.75, "y":2 },
-                { "label": "Enter", "matrix": [2, 12], "x":12.75, "y":2, "w":2.25 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
 
-                { "label": "Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-                { "label": "Z", "matrix": [3, 2], "x":2.25, "y":3 },
-                { "label": "X", "matrix": [3, 3], "x":3.25, "y":3 },
-                { "label": "C", "matrix": [3, 4], "x":4.25, "y":3 },
-                { "label": "V", "matrix": [3, 5], "x":5.25, "y":3 },
-                { "label": "B", "matrix": [3, 6], "x":6.25, "y":3 },
-                { "label": "N", "matrix": [3, 7], "x":7.25, "y":3 },
-                { "label": "M", "matrix": [3, 8], "x":8.25, "y":3 },
-                { "label": ",<", "matrix": [3, 9], "x":9.25, "y":3 },
-                { "label": ".>", "matrix": [3, 10], "x":10.25, "y":3 },
-                { "label": "/?", "matrix": [3, 11], "x":11.25, "y":3 },
-                { "label": "Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "label": "GUI", "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "label": "Space", "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
-                { "label": "Fn", "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-                { "label": "Menu", "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-                { "label": "Ctrl", "matrix": [4, 13], "x":13.75, "y":4, "w":1.25 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }

keyboards/idobao/id67/info.json

@@ -34,77 +34,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "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, "w":2 },
-                { "matrix": [0, 14], "x":15, "y":0 },
+                {"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, "w": 2},
+                {"matrix": [0, 14], "x": 15, "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": [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, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [2, 14], "x":15, "y":2 },
+                {"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, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "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": [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":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, 12], "x":13, "y":4 },
-                { "matrix": [4, 13], "x":14, "y":4 },
-                { "matrix": [4, 14], "x":15, "y":4 }
+                {"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, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }

keyboards/idobao/id80/v2/ansi/info.json

@@ -6,91 +6,91 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "matrix":[0, 5], "x":0, "y":0},
-                {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0},
-                {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0},
-                {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0},
-                {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0},
-                {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0},
-                {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0},
-                {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0},
-                {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0},
-                {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0},
-                {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0},
-                {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0},
-                {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0},
-                {"label":"Fn", "matrix":[6, 10], "x":14, "y":0},
-                {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0},
+                {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0},
+                {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0},
 
-                {"label":"`", "matrix":[0, 4], "x":0, "y":1.25},
-                {"label":"1", "matrix":[1, 4], "x":1, "y":1.25},
-                {"label":"2", "matrix":[2, 4], "x":2, "y":1.25},
-                {"label":"3", "matrix":[3, 4], "x":3, "y":1.25},
-                {"label":"4", "matrix":[4, 4], "x":4, "y":1.25},
-                {"label":"5", "matrix":[5, 4], "x":5, "y":1.25},
-                {"label":"6", "matrix":[6, 4], "x":6, "y":1.25},
-                {"label":"7", "matrix":[7, 4], "x":7, "y":1.25},
-                {"label":"8", "matrix":[8, 4], "x":8, "y":1.25},
-                {"label":"9", "matrix":[8, 9], "x":9, "y":1.25},
-                {"label":"0", "matrix":[7, 9], "x":10, "y":1.25},
-                {"label":"-", "matrix":[5, 9], "x":11, "y":1.25},
-                {"label":"=", "matrix":[4, 9], "x":12, "y":1.25},
-                {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2},
-                {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25},
+                {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.2, "w":1.55},
-                {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25},
-                {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25},
-                {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25},
-                {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25},
-                {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25},
-                {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25},
-                {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25},
-                {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25},
-                {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25},
-                {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25},
-                {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25},
-                {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25},
-                {"label":"\\", "matrix":[3, 8], "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25},
+                {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.2, "w": 1.55},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25},
-                {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25},
-                {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25},
-                {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25},
-                {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25},
-                {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25},
-                {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25},
-                {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25},
-                {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25},
-                {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25},
-                {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25, "w":2.25},
+                {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25},
-                {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25},
-                {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25},
-                {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25},
-                {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25},
-                {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25},
-                {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25},
-                {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25},
-                {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25},
-                {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25},
-                {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75},
-                {"label":"\u2191", "matrix":[3, 6], "x":14.25, "y":4.5},
+                {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "matrix":[5, 0], "x":13.25, "y":5.5},
-                {"label":"\u2193", "matrix":[4, 0], "x":14.25, "y":5.5},
-                {"label":"\u2192", "matrix":[3, 0], "x":15.25, "y":5.5}
+                {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "Win", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K06", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }

keyboards/idobao/id80/v2/iso/info.json

@@ -6,92 +6,92 @@
     "layouts": {
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "matrix":[0, 5], "x":0, "y":0},
-                {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0},
-                {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0},
-                {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0},
-                {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0},
-                {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0},
-                {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0},
-                {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0},
-                {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0},
-                {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0},
-                {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0},
-                {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0},
-                {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0},
-                {"label":"Fn", "matrix":[6, 10], "x":14, "y":0},
-                {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0},
+                {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0},
+                {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0},
 
-                {"label":"`", "matrix":[0, 4], "x":0, "y":1.25},
-                {"label":"1", "matrix":[1, 4], "x":1, "y":1.25},
-                {"label":"2", "matrix":[2, 4], "x":2, "y":1.25},
-                {"label":"3", "matrix":[3, 4], "x":3, "y":1.25},
-                {"label":"4", "matrix":[4, 4], "x":4, "y":1.25},
-                {"label":"5", "matrix":[5, 4], "x":5, "y":1.25},
-                {"label":"6", "matrix":[6, 4], "x":6, "y":1.25},
-                {"label":"7", "matrix":[7, 4], "x":7, "y":1.25},
-                {"label":"8", "matrix":[8, 4], "x":8, "y":1.25},
-                {"label":"9", "matrix":[8, 9], "x":9, "y":1.25},
-                {"label":"0", "matrix":[7, 9], "x":10, "y":1.25},
-                {"label":"-", "matrix":[5, 9], "x":11, "y":1.25},
-                {"label":"=", "matrix":[4, 9], "x":12, "y":1.25},
-                {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2},
-                {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25},
+                {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25},
-                {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25},
-                {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25},
-                {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25},
-                {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25},
-                {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25},
-                {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25},
-                {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25},
-                {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25},
-                {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25},
-                {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25},
-                {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25},
-                {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25},
+                {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25},
-                {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25},
-                {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25},
-                {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25},
-                {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25},
-                {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25},
-                {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25},
-                {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25},
-                {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25},
-                {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25},
-                {"label":"ISO #", "matrix":[4, 7], "x":12.75, "y":3.25},
-                {"label":"Enter", "matrix":[3, 8], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"label": "ISO #", "matrix": [4, 7], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 8], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "matrix":[1, 1], "x":1.25, "y":4.25},
-                {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25},
-                {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25},
-                {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25},
-                {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25},
-                {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25},
-                {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25},
-                {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25},
-                {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25},
-                {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25},
-                {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25},
-                {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Up", "matrix":[3, 6], "x":14.25, "y":4.5},
+                {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "ISO \\", "matrix": [1, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5},
-                {"label":"Left", "matrix":[5, 0], "x":13.25, "y":5.5},
-                {"label":"Down", "matrix":[4, 0], "x":14.25, "y":5.5},
-                {"label":"Right", "matrix":[3, 0], "x":15.25, "y":5.5}
+                {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }

keyboards/idobao/id80/v3/ansi/info.json

@@ -37,93 +37,93 @@
     "layouts": {
         "LAYOUT_80_ansi": {
             "layout": [
-                { "matrix": [0, 5], "x": 0, "y": 0 },
-                { "matrix": [1, 5], "x": 1.25, "y": 0 },
-                { "matrix": [2, 5], "x": 2.25, "y": 0 },
-                { "matrix": [3, 5], "x": 3.25, "y": 0 },
-                { "matrix": [4, 5], "x": 4.25, "y": 0 },
-                { "matrix": [5, 5], "x": 5.5, "y": 0 },
-                { "matrix": [6, 5], "x": 6.5, "y": 0 },
-                { "matrix": [7, 5], "x": 7.5, "y": 0 },
-                { "matrix": [8, 5], "x": 8.5, "y": 0 },
-                { "matrix": [7, 10], "x": 9.75, "y": 0 },
-                { "matrix": [5, 10], "x": 10.75, "y": 0 },
-                { "matrix": [4, 10], "x": 11.75, "y": 0 },
-                { "matrix": [3, 10], "x": 12.75, "y": 0 },
-                { "matrix": [6, 10], "x": 14, "y": 0 },
-                { "matrix": [2, 10], "x": 15.25, "y": 0 },
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 1.25, "y": 0},
+                {"matrix": [2, 5], "x": 2.25, "y": 0},
+                {"matrix": [3, 5], "x": 3.25, "y": 0},
+                {"matrix": [4, 5], "x": 4.25, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [6, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 5], "x": 7.5, "y": 0},
+                {"matrix": [8, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 10], "x": 9.75, "y": 0},
+                {"matrix": [5, 10], "x": 10.75, "y": 0},
+                {"matrix": [4, 10], "x": 11.75, "y": 0},
+                {"matrix": [3, 10], "x": 12.75, "y": 0},
+                {"matrix": [6, 10], "x": 14, "y": 0},
+                {"matrix": [2, 10], "x": 15.25, "y": 0},
 
-                { "matrix": [0, 4], "x": 0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 1, "y": 1.25 },
-                { "matrix": [2, 4], "x": 2, "y": 1.25 },
-                { "matrix": [3, 4], "x": 3, "y": 1.25 },
-                { "matrix": [4, 4], "x": 4, "y": 1.25 },
-                { "matrix": [5, 4], "x": 5, "y": 1.25 },
-                { "matrix": [6, 4], "x": 6, "y": 1.25 },
-                { "matrix": [7, 4], "x": 7, "y": 1.25 },
-                { "matrix": [8, 4], "x": 8, "y": 1.25 },
-                { "matrix": [8, 9], "x": 9, "y": 1.25 },
-                { "matrix": [7, 9], "x": 10, "y": 1.25 },
-                { "matrix": [5, 9], "x": 11, "y": 1.25 },
-                { "matrix": [4, 9], "x": 12, "y": 1.25 },
-                { "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2 },
-                { "matrix": [2, 9], "x": 15.25, "y": 1.25 },
+                {"matrix": [0, 4], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.25},
+                {"matrix": [2, 4], "x": 2, "y": 1.25},
+                {"matrix": [3, 4], "x": 3, "y": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 1.25},
+                {"matrix": [6, 4], "x": 6, "y": 1.25},
+                {"matrix": [7, 4], "x": 7, "y": 1.25},
+                {"matrix": [8, 4], "x": 8, "y": 1.25},
+                {"matrix": [8, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 9], "x": 10, "y": 1.25},
+                {"matrix": [5, 9], "x": 11, "y": 1.25},
+                {"matrix": [4, 9], "x": 12, "y": 1.25},
+                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                { "matrix": [0, 3], "x":0, "y":2.25, "w":1.5},
-                { "matrix": [1, 3], "x":1.5, "y":2.25},
-                { "matrix": [2, 3], "x":2.5, "y":2.25},
-                { "matrix": [3, 3], "x":3.5, "y":2.25},
-                { "matrix": [4, 3], "x":4.5, "y":2.25},
-                { "matrix": [5, 3], "x":5.5, "y":2.25},
-                { "matrix": [6, 3], "x":6.5, "y":2.25},
-                { "matrix": [7, 3], "x":7.5, "y":2.25},
-                { "matrix": [8, 3], "x":8.5, "y":2.25},
-                { "matrix": [8, 8], "x":9.5, "y":2.25},
-                { "matrix": [7, 8], "x":10.5, "y":2.25},
-                { "matrix": [5, 8], "x":11.5, "y":2.25},
-                { "matrix": [4, 8], "x":12.5, "y":2.25},
-                { "matrix": [3, 8], "x":13.5, "y":2.25, "w":1.5},
-                { "matrix": [2, 8], "x":15.25, "y":2.25},
+                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                { "matrix": [0, 2], "x":0, "y":3.25, "w":1.75},
-                { "matrix": [1, 2], "x":1.75, "y":3.25},
-                { "matrix": [2, 2], "x":2.75, "y":3.25},
-                { "matrix": [3, 2], "x":3.75, "y":3.25},
-                { "matrix": [4, 2], "x":4.75, "y":3.25},
-                { "matrix": [5, 2], "x":5.75, "y":3.25},
-                { "matrix": [6, 2], "x":6.75, "y":3.25},
-                { "matrix": [7, 2], "x":7.75, "y":3.25},
-                { "matrix": [8, 2], "x":8.75, "y":3.25},
-                { "matrix": [8, 7], "x":9.75, "y":3.25},
-                { "matrix": [7, 7], "x":10.75, "y":3.25},
-                { "matrix": [5, 7], "x":11.75, "y":3.25},
-                { "matrix": [4, 7], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                { "matrix": [0, 1], "x":0, "y":4.25, "w":2.25},
-                { "matrix": [2, 1], "x":2.25, "y":4.25},
-                { "matrix": [3, 1], "x":3.25, "y":4.25},
-                { "matrix": [4, 1], "x":4.25, "y":4.25},
-                { "matrix": [5, 1], "x":5.25, "y":4.25},
-                { "matrix": [6, 1], "x":6.25, "y":4.25},
-                { "matrix": [7, 1], "x":7.25, "y":4.25},
-                { "matrix": [8, 1], "x":8.25, "y":4.25},
-                { "matrix": [8, 6], "x":9.25, "y":4.25},
-                { "matrix": [7, 6], "x":10.25, "y":4.25},
-                { "matrix": [5, 6], "x":11.25, "y":4.25},
-                { "matrix": [4, 6], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
 
-                { "matrix": [3, 6], "x":14.25, "y":4.5},
+                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                { "matrix": [0, 0], "x":0, "y":5.25, "w":1.25},
-                { "matrix": [1, 0], "x":1.25, "y":5.25, "w":1.25},
-                { "matrix": [2, 0], "x":2.5, "y":5.25, "w":1.25},
-                { "matrix": [6, 0], "x":3.75, "y":5.25, "w":6.25},
-                { "matrix": [8, 0], "x":10, "y":5.25, "w":1.5},
-                { "matrix": [7, 0], "x":11.5, "y":5.25, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
 
-                { "matrix": [5, 0], "x":13.25, "y":5.5},
-                { "matrix": [4, 0], "x":14.25, "y":5.5},
-                { "matrix": [3, 0], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }

keyboards/jels/boaty/info.json

@@ -8,10 +8,9 @@
     },
     "url": "",
     "maintainer": "Jels",
-    "processor":"atmega328p",
-    "bootloader":"usbasploader",
-    "features":
-    {
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
         "bootmagic": true,
         "nkro": false,
         "mousekey": false,
@@ -28,69 +27,69 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Num Lock", "matrix": [2, 10], "x":6.75, "y": 0 },
-                { "label": "-", "matrix": [1, 10], "x":6.75, "y": 1 },
-                { "label": "*", "matrix": [1, 9], "x":7.75, "y": 1 },
-                { "label": "7", "matrix": [0, 8], "x":6.75, "y": 2 },
-                { "label": "8", "matrix": [0, 9], "x":7.75, "y": 2 },
-                { "label": "9", "matrix": [0, 10], "x":8.75, "y": 2 },
-                { "label": "4", "matrix": [0, 4], "x":6.75, "y": 3 },
-                { "label": "5", "matrix": [0, 5], "x":7.75, "y": 3 },
-                { "label": "6", "matrix": [0, 6], "x":8.75, "y": 3 },
-                { "label": "+", "matrix": [0, 7], "x":9.75, "y": 3 },
-                { "label": "1", "matrix": [1, 4], "x":6.75, "y": 4 },
-                { "label": "2", "matrix": [1, 5], "x":7.75, "y": 4 },
-                { "label": "3", "matrix": [1, 6], "x":8.75, "y": 4 },
-                { "label": "Ent", "matrix": [1, 7], "x":9.75, "y": 4 },
-                { "label": "/", "matrix": [1, 8], "x":10.75, "y": 4 },
-                { "label": "0", "matrix": [2, 4], "x":6.75, "y": 5 },
-                { "label": "00", "matrix": [2, 5], "x":7.75, "y": 5 },
-                { "label": ".", "matrix": [2, 6], "x":8.75, "y": 5 },
-                { "label": "Ent", "matrix": [2, 7], "x":9.75, "y": 5 },
-                { "label": "=", "matrix": [2, 8], "x":10.75, "y": 5 },
-                { "label": "Back", "matrix": [2, 9], "x":11.75, "y": 5 },
-                { "label": "Esc", "matrix": [6, 0], "x":0, "y": 7.25 },
-                { "label": "Tab", "matrix": [4, 0], "x":1, "y": 7.25 },
-                { "label": "Q", "matrix": [5, 0], "x":2, "y": 7.25 },
-                { "label": "W", "matrix": [5, 1], "x":3, "y": 7.25 },
-                { "label": "E", "matrix": [5, 2], "x":4, "y": 7.25 },
-                { "label": "R", "matrix": [5, 3], "x":5, "y": 7.25 },
-                { "label": "T", "matrix": [5, 4], "x":6, "y": 7.25 },
-                { "label": "Y", "matrix": [3, 5], "x":7, "y": 7.25 },
-                { "label": "U", "matrix": [3, 6], "x":8, "y": 7.25 },
-                { "label": "I", "matrix": [3, 7], "x":9, "y": 7.25 },
-                { "label": "O", "matrix": [3, 8], "x":10, "y": 7.25 },
-                { "label": "P", "matrix": [3, 9], "x":11, "y": 7.25 },
-                { "label": "Back", "matrix": [3, 10], "x":12, "y": 7.25 },
-                { "label": "Del", "matrix": [5, 10], "x":13, "y": 7.25 },
-                { "label": "Caps", "matrix": [6, 1], "x":1, "y": 8.25 },
-                { "label": "A", "matrix": [3, 0], "x":2, "y": 8.25 },
-                { "label": "S", "matrix": [3, 1], "x":3, "y": 8.25 },
-                { "label": "D", "matrix": [3, 2], "x":4, "y": 8.25 },
-                { "label": "F", "matrix": [3, 3], "x":5, "y": 8.25 },
-                { "label": "G", "matrix": [3, 4], "x":6, "y": 8.25 },
-                { "label": "H", "matrix": [4, 5], "x":7, "y": 8.25 },
-                { "label": "J", "matrix": [4, 6], "x":8, "y": 8.25 },
-                { "label": "K", "matrix": [4, 7], "x":9, "y": 8.25 },
-                { "label": "L", "matrix": [4, 8], "x":10, "y": 8.25 },
-                { "label": ":", "matrix": [4, 9], "x":11, "y": 8.25 },
-                { "label": "Enter", "matrix": [4, 10], "x":12, "y": 8.25 },
-                { "label": "Shift", "matrix": [6, 2], "x":2, "y": 9.25 },
-                { "label": "Z", "matrix": [4, 1], "x":3, "y": 9.25 },
-                { "label": "X", "matrix": [4, 2], "x":4, "y": 9.25 },
-                { "label": "C", "matrix": [4, 3], "x":5, "y": 9.25 },
-                { "label": "V", "matrix": [4, 4], "x":6, "y": 9.25 },
-                { "label": "B", "matrix": [5, 5], "x":7, "y": 9.25 },
-                { "label": "N", "matrix": [5, 6], "x":8, "y": 9.25 },
-                { "label": "M", "matrix": [5, 7], "x":9, "y": 9.25 },
-                { "label": "<", "matrix": [5, 8], "x":10, "y": 9.25 },
-                { "label": "Shift", "matrix": [5, 9], "x":11, "y": 9.25 },
-                { "label": "Ctl", "matrix": [6, 3], "x":4, "y": 10.25 },
-                { "label": "Alt", "matrix": [6, 4], "x":5, "y": 10.25 },
-                { "matrix": [6, 6], "x":6, "y": 10.25 },
-                { "matrix": [6, 7], "x":7, "y": 10.25 },
-                { "label": "Alt", "matrix": [6, 8], "x":8, "y": 10.25 },
-                { "label": "Ctl", "matrix": [6, 9], "x":9, "y": 10.25 }
+                {"label": "Num Lock", "matrix": [2, 10], "x": 6.75, "y": 0},
+                {"label": "-", "matrix": [1, 10], "x": 6.75, "y": 1},
+                {"label": "*", "matrix": [1, 9], "x": 7.75, "y": 1},
+                {"label": "7", "matrix": [0, 8], "x": 6.75, "y": 2},
+                {"label": "8", "matrix": [0, 9], "x": 7.75, "y": 2},
+                {"label": "9", "matrix": [0, 10], "x": 8.75, "y": 2},
+                {"label": "4", "matrix": [0, 4], "x": 6.75, "y": 3},
+                {"label": "5", "matrix": [0, 5], "x": 7.75, "y": 3},
+                {"label": "6", "matrix": [0, 6], "x": 8.75, "y": 3},
+                {"label": "+", "matrix": [0, 7], "x": 9.75, "y": 3},
+                {"label": "1", "matrix": [1, 4], "x": 6.75, "y": 4},
+                {"label": "2", "matrix": [1, 5], "x": 7.75, "y": 4},
+                {"label": "3", "matrix": [1, 6], "x": 8.75, "y": 4},
+                {"label": "Ent", "matrix": [1, 7], "x": 9.75, "y": 4},
+                {"label": "/", "matrix": [1, 8], "x": 10.75, "y": 4},
+                {"label": "0", "matrix": [2, 4], "x": 6.75, "y": 5},
+                {"label": "00", "matrix": [2, 5], "x": 7.75, "y": 5},
+                {"label": ".", "matrix": [2, 6], "x": 8.75, "y": 5},
+                {"label": "Ent", "matrix": [2, 7], "x": 9.75, "y": 5},
+                {"label": "=", "matrix": [2, 8], "x": 10.75, "y": 5},
+                {"label": "Back", "matrix": [2, 9], "x": 11.75, "y": 5},
+                {"label": "Esc", "matrix": [6, 0], "x": 0, "y": 7.25},
+                {"label": "Tab", "matrix": [4, 0], "x": 1, "y": 7.25},
+                {"label": "Q", "matrix": [5, 0], "x": 2, "y": 7.25},
+                {"label": "W", "matrix": [5, 1], "x": 3, "y": 7.25},
+                {"label": "E", "matrix": [5, 2], "x": 4, "y": 7.25},
+                {"label": "R", "matrix": [5, 3], "x": 5, "y": 7.25},
+                {"label": "T", "matrix": [5, 4], "x": 6, "y": 7.25},
+                {"label": "Y", "matrix": [3, 5], "x": 7, "y": 7.25},
+                {"label": "U", "matrix": [3, 6], "x": 8, "y": 7.25},
+                {"label": "I", "matrix": [3, 7], "x": 9, "y": 7.25},
+                {"label": "O", "matrix": [3, 8], "x": 10, "y": 7.25},
+                {"label": "P", "matrix": [3, 9], "x": 11, "y": 7.25},
+                {"label": "Back", "matrix": [3, 10], "x": 12, "y": 7.25},
+                {"label": "Del", "matrix": [5, 10], "x": 13, "y": 7.25},
+                {"label": "Caps", "matrix": [6, 1], "x": 1, "y": 8.25},
+                {"label": "A", "matrix": [3, 0], "x": 2, "y": 8.25},
+                {"label": "S", "matrix": [3, 1], "x": 3, "y": 8.25},
+                {"label": "D", "matrix": [3, 2], "x": 4, "y": 8.25},
+                {"label": "F", "matrix": [3, 3], "x": 5, "y": 8.25},
+                {"label": "G", "matrix": [3, 4], "x": 6, "y": 8.25},
+                {"label": "H", "matrix": [4, 5], "x": 7, "y": 8.25},
+                {"label": "J", "matrix": [4, 6], "x": 8, "y": 8.25},
+                {"label": "K", "matrix": [4, 7], "x": 9, "y": 8.25},
+                {"label": "L", "matrix": [4, 8], "x": 10, "y": 8.25},
+                {"label": ":", "matrix": [4, 9], "x": 11, "y": 8.25},
+                {"label": "Enter", "matrix": [4, 10], "x": 12, "y": 8.25},
+                {"label": "Shift", "matrix": [6, 2], "x": 2, "y": 9.25},
+                {"label": "Z", "matrix": [4, 1], "x": 3, "y": 9.25},
+                {"label": "X", "matrix": [4, 2], "x": 4, "y": 9.25},
+                {"label": "C", "matrix": [4, 3], "x": 5, "y": 9.25},
+                {"label": "V", "matrix": [4, 4], "x": 6, "y": 9.25},
+                {"label": "B", "matrix": [5, 5], "x": 7, "y": 9.25},
+                {"label": "N", "matrix": [5, 6], "x": 8, "y": 9.25},
+                {"label": "M", "matrix": [5, 7], "x": 9, "y": 9.25},
+                {"label": "<", "matrix": [5, 8], "x": 10, "y": 9.25},
+                {"label": "Shift", "matrix": [5, 9], "x": 11, "y": 9.25},
+                {"label": "Ctl", "matrix": [6, 3], "x": 4, "y": 10.25},
+                {"label": "Alt", "matrix": [6, 4], "x": 5, "y": 10.25},
+                {"matrix": [6, 6], "x": 6, "y": 10.25},
+                {"matrix": [6, 7], "x": 7, "y": 10.25},
+                {"label": "Alt", "matrix": [6, 8], "x": 8, "y": 10.25},
+                {"label": "Ctl", "matrix": [6, 9], "x": 9, "y": 10.25}
             ]
         }
     }

keyboards/jolofsor/denial75/info.json

@@ -25,95 +25,95 @@
     "layouts": {
         "LAYOUT_denial75_ansi": {
             "layout": [
-                {"x":0, "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":8.25, "y":0, "matrix": [0, 8]},
-                {"x":9.25, "y":0, "matrix": [0, 9]},
-                {"x":10.25, "y":0, "matrix": [0, 10]},
-                {"x":11.25, "y":0, "matrix": [0, 11]},
-                {"x":12.25, "y":0, "matrix": [0, 12]},
-                {"x":13.5, "y":0, "matrix": [0, 13]},
-                {"x":14.5, "y":0, "matrix": [0, 14]},
-                {"x":15.5, "y":0, "matrix": [0, 15]},
+                {"x": 0, "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": 8.25, "y": 0, "matrix": [0, 8]},
+                {"x": 9.25, "y": 0, "matrix": [0, 9]},
+                {"x": 10.25, "y": 0, "matrix": [0, 10]},
+                {"x": 11.25, "y": 0, "matrix": [0, 11]},
+                {"x": 12.25, "y": 0, "matrix": [0, 12]},
+                {"x": 13.5, "y": 0, "matrix": [0, 13]},
+                {"x": 14.5, "y": 0, "matrix": [0, 14]},
+                {"x": 15.5, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1.25, "matrix": [1, 0]},
-                {"x":1, "y":1.25, "matrix": [1, 1]},
-                {"x":2, "y":1.25, "matrix": [1, 2]},
-                {"x":3, "y":1.25, "matrix": [1, 3]},
-                {"x":4, "y":1.25, "matrix": [1, 4]},
-                {"x":5, "y":1.25, "matrix": [1, 5]},
-                {"x":6, "y":1.25, "matrix": [1, 6]},
-                {"x":7, "y":1.25, "matrix": [1, 7]},
-                {"x":8, "y":1.25, "matrix": [1, 8]},
-                {"x":9, "y":1.25, "matrix": [1, 9]},
-                {"x":10, "y":1.25, "matrix": [1, 10]},
-                {"x":11, "y":1.25, "matrix": [1, 11]},
-                {"x":12, "y":1.25, "matrix": [1, 12]},
-                {"x":13, "y":1.25, "w":2, "matrix": [1, 14]},
-                {"x":15.5, "y":1.25, "matrix": [1, 15]},
+                {"x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"x": 13, "y": 1.25, "w": 2, "matrix": [1, 14]},
+                {"x": 15.5, "y": 1.25, "matrix": [1, 15]},
 
-                {"x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.25, "matrix": [2, 2]},
-                {"x":2.5, "y":2.25, "matrix": [2, 3]},
-                {"x":3.5, "y":2.25, "matrix": [2, 4]},
-                {"x":4.5, "y":2.25, "matrix": [2, 5]},
-                {"x":5.5, "y":2.25, "matrix": [2, 6]},
-                {"x":6.5, "y":2.25, "matrix": [2, 7]},
-                {"x":7.5, "y":2.25, "matrix": [2, 8]},
-                {"x":8.5, "y":2.25, "matrix": [2, 9]},
-                {"x":9.5, "y":2.25, "matrix": [2, 10]},
-                {"x":10.5, "y":2.25, "matrix": [2, 11]},
-                {"x":11.5, "y":2.25, "matrix": [2, 12]},
-                {"x":12.5, "y":2.25, "matrix": [2, 13]},
-                {"x":13.5, "y":2.25, "w":1.5, "matrix": [2, 14]},
-                {"x":15.5, "y":2.25, "matrix": [2, 15]},
+                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 3]},
+                {"x": 3.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 5]},
+                {"x": 5.5, "y": 2.25, "matrix": [2, 6]},
+                {"x": 6.5, "y": 2.25, "matrix": [2, 7]},
+                {"x": 7.5, "y": 2.25, "matrix": [2, 8]},
+                {"x": 8.5, "y": 2.25, "matrix": [2, 9]},
+                {"x": 9.5, "y": 2.25, "matrix": [2, 10]},
+                {"x": 10.5, "y": 2.25, "matrix": [2, 11]},
+                {"x": 11.5, "y": 2.25, "matrix": [2, 12]},
+                {"x": 12.5, "y": 2.25, "matrix": [2, 13]},
+                {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 14]},
+                {"x": 15.5, "y": 2.25, "matrix": [2, 15]},
 
-                {"x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"x":1.75, "y":3.25, "matrix": [3, 2]},
-                {"x":2.75, "y":3.25, "matrix": [3, 3]},
-                {"x":3.75, "y":3.25, "matrix": [3, 4]},
-                {"x":4.75, "y":3.25, "matrix": [3, 5]},
-                {"x":5.75, "y":3.25, "matrix": [3, 6]},
-                {"x":6.75, "y":3.25, "matrix": [3, 7]},
-                {"x":7.75, "y":3.25, "matrix": [3, 8]},
-                {"x":8.75, "y":3.25, "matrix": [3, 9]},
-                {"x":9.75, "y":3.25, "matrix": [3, 10]},
-                {"x":10.75, "y":3.25, "matrix": [3, 11]},
-                {"x":11.75, "y":3.25, "matrix": [3, 12]},
-                {"x":12.75, "y":3.25, "w":2.25, "matrix": [3, 13]},
-                {"x":15.5, "y":3.25, "matrix": [3, 15]},
+                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.25, "matrix": [3, 2]},
+                {"x": 2.75, "y": 3.25, "matrix": [3, 3]},
+                {"x": 3.75, "y": 3.25, "matrix": [3, 4]},
+                {"x": 4.75, "y": 3.25, "matrix": [3, 5]},
+                {"x": 5.75, "y": 3.25, "matrix": [3, 6]},
+                {"x": 6.75, "y": 3.25, "matrix": [3, 7]},
+                {"x": 7.75, "y": 3.25, "matrix": [3, 8]},
+                {"x": 8.75, "y": 3.25, "matrix": [3, 9]},
+                {"x": 9.75, "y": 3.25, "matrix": [3, 10]},
+                {"x": 10.75, "y": 3.25, "matrix": [3, 11]},
+                {"x": 11.75, "y": 3.25, "matrix": [3, 12]},
+                {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [3, 13]},
+                {"x": 15.5, "y": 3.25, "matrix": [3, 15]},
 
-                {"x":0, "y":4.25, "w":2.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.25, "y":4.5, "matrix": [4, 14]},
-                {"x":15.5, "y":4.25, "matrix": [4, 15]},
+                {"x": 0, "y": 4.25, "w": 2.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.25, "y": 4.5, "matrix": [4, 14]},
+                {"x": 15.5, "y": 4.25, "matrix": [4, 15]},
 
-                {"x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
-                {"x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
-                {"x":2.5, "y":5.25, "w":1.25, "matrix": [5, 3]},
-                {"x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
-                {"x":10, "y":5.25, "matrix": [5, 10]},
-                {"x":11, "y":5.25, "matrix": [5, 11]},
-                {"x":12, "y":5.25, "matrix": [5, 12]},
-                {"x":13.25, "y":5.5, "matrix": [5, 13]},
-                {"x":14.25, "y":5.5, "matrix": [5, 14]},
-                {"x":15.25, "y":5.5, "matrix": [5, 15]}
+                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
+                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"x": 10, "y": 5.25, "matrix": [5, 10]},
+                {"x": 11, "y": 5.25, "matrix": [5, 11]},
+                {"x": 12, "y": 5.25, "matrix": [5, 12]},
+                {"x": 13.25, "y": 5.5, "matrix": [5, 13]},
+                {"x": 14.25, "y": 5.5, "matrix": [5, 14]},
+                {"x": 15.25, "y": 5.5, "matrix": [5, 15]}
             ]
         }
     }

keyboards/junco/info.json

@@ -20,94 +20,70 @@
     "layouts": {
         "LAYOUT_split4x6_r1": {
             "layout": [
-                { "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0.3 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0.45 },
-                { "label": "6", "matrix": [5, 5], "x": 9, "y": 0.45 },
-                { "label": "7", "matrix": [5, 4], "x": 10, "y": 0.3 },
-                { "label": "8", "matrix": [5, 3], "x": 11, "y": 0 },
-                { "label": "9", "matrix": [5, 2], "x": 12, "y": 0.3 },
-                { "label": "0", "matrix": [5, 1], "x": 13, "y": 0.7 },
-                { "label": "-", "matrix": [5, 0], "x": 14, "y": 0.7 },
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45},
+                {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45},
+                {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3},
+                {"label": "8", "matrix": [5, 3], "x": 11, "y": 0},
+                {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3},
+                {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7},
+                {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7 },
-                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7 },
-                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.3 },
-                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.3 },
-                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.45 },
-                { "label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45 },
-                { "label": "U", "matrix": [6, 4], "x": 10, "y": 1.3 },
-                { "label": "I", "matrix": [6, 3], "x": 11, "y": 1 },
-                { "label": "O", "matrix": [6, 2], "x": 12, "y": 1.3 },
-                { "label": "P", "matrix": [6, 1], "x": 13, "y": 1.7 },
-                { "label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45},
+                {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45},
+                {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3},
+                {"label": "I", "matrix": [6, 3], "x": 11, "y": 1},
+                {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3},
+                {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7},
+                {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7},
 
-                { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7 },
-                { "label": "A", "matrix": [2, 1], "x": 1, "y": 2.7 },
-                { "label": "S", "matrix": [2, 2], "x": 2, "y": 2.3 },
-                { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4, "y": 2.3 },
-                { "label": "G", "matrix": [2, 5], "x": 5, "y": 2.45 },
-                { "label": "H", "matrix": [7, 5], "x": 9, "y": 2.45 },
-                { "label": "J", "matrix": [7, 4], "x": 10, "y": 2.3 },
-                { "label": "K", "matrix": [7, 3], "x": 11, "y": 2 },
-                { "label": "L", "matrix": [7, 2], "x": 12, "y": 2.3 },
-                { "label": ";", "matrix": [7, 1], "x": 13, "y": 2.7 },
-                { "label": "'", "matrix": [7, 0], "x": 14, "y": 2.7 },
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7},
+                {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7},
+                {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3},
+                {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3},
+                {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45},
+                {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45},
+                {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3},
+                {"label": "K", "matrix": [7, 3], "x": 11, "y": 2},
+                {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3},
+                {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7},
+                {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7 },
-                { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7 },
-                { "label": "X", "matrix": [3, 2], "x": 2, "y": 3.3 },
-                { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 4, "y": 3.3 },
-                { "label": "B", "matrix": [3, 5], "x": 5, "y": 3.45 },
-                { "label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45 },
-                { "label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45 },
-                { "label": "N", "matrix": [8, 5], "x": 9, "y": 3.45 },
-                { "label": "M", "matrix": [8, 4], "x": 10, "y": 3.3 },
-                { "label": ",", "matrix": [8, 3], "x": 11, "y": 3 },
-                { "label": ".", "matrix": [8, 2], "x": 12, "y": 3.3 },
-                { "label": "/", "matrix": [8, 1], "x": 13, "y": 3.7 },
-                { "label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7},
+                {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7},
+                {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3},
+                {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3},
+                {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45},
+                {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45},
+                {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45},
+                {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45},
+                {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3},
+                {"label": ",", "matrix": [8, 3], "x": 11, "y": 3},
+                {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3},
+                {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7},
+                {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
-                { "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
-                {
-                    "label": "Del",
-                    "matrix": [4, 3],
-                    "x": 5.1,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Spc",
-                    "matrix": [4, 4],
-                    "x": 6.1,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Shift",
-                    "matrix": [9, 3],
-                    "x": 7.9,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Bspc",
-                    "matrix": [9, 4],
-                    "x": 8.9,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                { "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
-                { "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
-                { "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3},
+                {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3},
+                {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5},
+                {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5},
+                {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5},
+                {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5},
+                {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3},
+                {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3}
             ]
         }
     }

keyboards/karlb/kbic65/info.json

@@ -5,27 +5,8 @@
     "maintainer": "b-karl",
     "diode_direction": "ROW2COL",
     "matrix_pins": {
-        "cols": [
-            "B2",
-            "B6",
-            "B3",
-            "B1",
-            "F7",
-            "F6",
-            "F5",
-            "F4"
-        ],
-        "rows": [
-            "B5",
-            "D1",
-            "B4",
-            "D0",
-            "E6",
-            "D4",
-            "D7",
-            "C6",
-            "D2"
-        ]
+        "cols": ["B2", "B6", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "D1", "B4", "D0", "E6", "D4", "D7", "C6", "D2"]
     },
     "usb": {
         "vid": "0x424B",

keyboards/kb_elmo/isolation/info.json

@@ -21,7 +21,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.25, "y":0, "w":1.25, "h":2, "matrix": [0, 0]}
+                {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]}
             ]
         }
     }

keyboards/kbdcraft/adam64/info.json

@@ -15,7 +15,7 @@
         "rows": ["C8", "C9", "A8", "A10", "B14"],
         "cols": ["B15", "C6", "C7", "A15", "B7", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "A0", "A1"]
     },
-    "features":{
+    "features": {
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
@@ -24,10 +24,10 @@
         "command": false,
         "rgb_matrix": true
     },
-    "rgb_matrix":{
+    "rgb_matrix": {
         "driver": "IS31FL3741",
         "max_brightness": 150,
-        "animations":{
+        "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -65,147 +65,147 @@
             "solid_multisplash": true
         },
         "layout": [
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
-            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },
-            {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0 },
-            {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0 },
-            {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0 },
-            {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0 },
-            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0 },
-            {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0 },
-            {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0 },
-            {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0 },
-            {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0 },
-            {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0 },
-            {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0 },
-            {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0 },
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0},
 
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10 },
-            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10 },
-            {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10 },
-            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10 },
-            {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10 },
-            {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10 },
-            {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10 },
-            {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10 },
-            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10 },
-            {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10 },
-            {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10 },
-            {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10 },
-            {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10 },
-            {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10 },
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10},
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10},
+            {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10},
+            {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10},
+            {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10},
+            {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10},
+            {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10},
+            {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10},
+            {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10},
+            {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10},
+            {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10},
+            {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10},
 
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20 },
-            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20 },
-            {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20 },
-            {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20 },
-            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20 },
-            {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20 },
-            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20 },
-            {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20 },
-            {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20 },
-            {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20 },
-            {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20 },
-            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20 },
-            {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20 },
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20},
+            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20},
+            {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20},
+            {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20},
+            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20},
+            {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20},
+            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20},
+            {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20},
+            {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20},
+            {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20},
+            {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20},
+            {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20},
 
-            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30 },
-            {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30 },
-            {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30 },
-            {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30 },
-            {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30 },
-            {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30 },
-            {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30 },
-            {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30 },
-            {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30 },
-            {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30 },
-            {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30 },
-            {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30 },
-            {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30 },
-            {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30 },
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30},
+            {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30},
+            {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30},
+            {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30},
+            {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30},
+            {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30},
+            {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30},
+            {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30},
+            {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30},
+            {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30},
+            {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30},
+            {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30},
+            {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30},
+            {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30},
 
-            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40 },
-            {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40 },
-            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40 },
-            {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40 },
-            {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40 },
-            {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40 },
-            {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40 },
-            {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40 },
-            {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 }
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40},
+            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40},
+            {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40},
+            {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40},
+            {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40},
+            {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40},
+            {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40}
         ]
     },
     "layouts": {
         "LAYOUT_64_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, 13], "w": 2, "x": 13, "y": 0 },
+                {"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], "w": 2, "x": 13, "y": 0},
 
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "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], "w": 1.5, "x": 13.5, "y": 1 },
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"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], "w": 1.5, "x": 13.5, "y": 1},
 
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "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, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"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, 13], "w": 2.25, "x": 12.75, "y": 2},
 
-                { "matrix": [3, 0], "w": 2, "x": 0, "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": [3, 12], "x": 13, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
+                {"matrix": [3, 0], "w": 2, "x": 0, "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": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 },
-                { "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, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"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}
             ]
         }
     }

keyboards/keebio/bamfk1/info.json

@@ -28,7 +28,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1.5, "y": 0, "h":2, "w": 2, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
                 {"x": 0.5, "y": 2.25, "matrix": [0, 1]},
                 {"x": 3.5, "y": 2.25, "matrix": [0, 2]},
 

keyboards/keebio/bdn9/info.json

@@ -8,15 +8,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }

keyboards/keebio/choconum/info.json

@@ -23,55 +23,55 @@
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"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": 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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "h":2, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "h": 2, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "h":2, "matrix": [3, 3]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "h": 2, "matrix": [3, 3]},
 
-                {"x":0, "y":4, "w":2, "matrix": [4, 0]},
-                {"x":2, "y":4, "matrix": [4, 2]}
+                {"x": 0, "y": 4, "w": 2, "matrix": [4, 0]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
             ]
         },
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"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": 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":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
 
-                {"x":0, "y":3, "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": 0, "y": 3, "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":0, "y":4, "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": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]},
+                {"x": 3, "y": 4, "matrix": [4, 3]}
             ]
         }
     }

keyboards/keebio/sinc/rev1/info.json

@@ -28,7 +28,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
                 "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
             }
@@ -44,11 +44,11 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
-    "backlight":{
+    "backlight": {
         "pin": "B5"
     },
     "rgblight": {
-        "led_count" : 16,
+        "led_count": 16,
         "split_count": [8, 8],
         "animations": {
             "alternating": true,

keyboards/keebio/sinc/rev2/info.json

@@ -28,7 +28,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
                 "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
             }
@@ -44,11 +44,11 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
-    "backlight":{
+    "backlight": {
         "pin": "B5"
     },
     "rgblight": {
-        "led_count" : 16,
+        "led_count": 16,
         "split_count": [8, 8],
         "animations": {
             "alternating": true,

keyboards/keebio/sinc/rev3/info.json

@@ -23,7 +23,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
             }
@@ -47,132 +47,132 @@
         "driver": "WS2812",
         "split_count": [56, 57],
         "layout": [
-            { "flags": 4, "matrix": [5, 2], "x": 30, "y": 0 },
-            { "flags": 2, "x": 42, "y": 6 },
-            { "flags": 4, "matrix": [5, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [5, 4], "x": 58, "y": 0 },
-            { "flags": 2, "x": 67, "y": 6 },
-            { "flags": 4, "matrix": [5, 5], "x": 70, "y": 0 },
-            { "flags": 4, "matrix": [5, 6], "x": 82, "y": 0 },
-            { "flags": 4, "matrix": [5, 7], "x": 97, "y": 0 },
-            { "flags": 2, "x": 103, "y": 6 },
-            { "flags": 4, "matrix": [5, 8], "x": 109, "y": 0 },
-
-            { "flags": 4, "matrix": [0, 8], "x": 103, "y": 15 },
-            { "flags": 4, "matrix": [0, 7], "x": 91, "y": 15 },
-            { "flags": 4, "matrix": [0, 6], "x": 79, "y": 15 },
-            { "flags": 4, "matrix": [0, 5], "x": 67, "y": 15 },
-            { "flags": 4, "matrix": [0, 4], "x": 54, "y": 15 },
-            { "flags": 4, "matrix": [0, 3], "x": 42, "y": 15 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 15 },
-
-            { "flags": 4, "matrix": [1, 2], "x": 33, "y": 27 },
-            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 27 },
-            { "flags": 4, "matrix": [1, 4], "x": 61, "y": 27 },
-            { "flags": 4, "matrix": [1, 5], "x": 73, "y": 27 },
-            { "flags": 4, "matrix": [1, 6], "x": 85, "y": 27 },
-            { "flags": 4, "matrix": [1, 7], "x": 97, "y": 27 },
-
-            { "flags": 4, "matrix": [2, 7], "x": 100, "y": 40 },
-            { "flags": 4, "matrix": [2, 6], "x": 88, "y": 40 },
-            { "flags": 4, "matrix": [2, 5], "x": 76, "y": 40 },
-            { "flags": 4, "matrix": [2, 4], "x": 64, "y": 40 },
-            { "flags": 4, "matrix": [2, 3], "x": 51, "y": 40 },
-            { "flags": 4, "matrix": [2, 2], "x": 35, "y": 40 },
-
-            { "flags": 4, "matrix": [3, 2], "x": 38, "y": 52 },
-            { "flags": 4, "matrix": [3, 4], "x": 58, "y": 52 },
-            { "flags": 4, "matrix": [3, 5], "x": 70, "y": 52 },
-            { "flags": 4, "matrix": [3, 6], "x": 82, "y": 52 },
-            { "flags": 4, "matrix": [3, 7], "x": 94, "y": 52 },
-            { "flags": 4, "matrix": [3, 8], "x": 106, "y": 52 },
-
-            { "flags": 2, "x": 106, "y": 64 },
-            { "flags": 4, "matrix": [4, 7], "x": 98, "y": 64 },
-            { "flags": 4, "matrix": [4, 5], "x": 77, "y": 64 },
-            { "flags": 2, "x": 67, "y": 64 },
-            { "flags": 4, "matrix": [4, 4], "x": 62, "y": 64 },
-            { "flags": 4, "matrix": [4, 3], "x": 47, "y": 64 },
-            { "flags": 2, "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 },
-
-            { "flags": 4, "matrix": [4, 1], "x": 12, "y": 64 },
-            { "flags": 2, "x": 6, "y": 64 },
-            { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 },
-
-            { "flags": 4, "matrix": [3, 0], "x": 0, "y": 52 },
-            { "flags": 4, "matrix": [3, 1], "x": 12, "y": 52 },
-            { "flags": 4, "matrix": [2, 1], "x": 12, "y": 40 },
-            { "flags": 4, "matrix": [2, 0], "x": 0, "y": 40 },
-            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 27 },
-            { "flags": 4, "matrix": [1, 1], "x": 12, "y": 27 },
-            { "flags": 4, "matrix": [0, 1], "x": 12, "y": 15 },
-            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 15 },
-            { "flags": 4, "matrix": [5, 0], "x": 0, "y": 0 },
-            { "flags": 2, "x": 9, "y": 0 },
-
-            { "flags": 2, "x": 224, "y": 6 },
-            { "flags": 4, "matrix": [11, 8], "x": 224, "y": 0 },
-            { "flags": 4, "matrix": [11, 7], "x": 212, "y": 0 },
-            { "flags": 4, "matrix": [11, 6], "x": 197, "y": 0 },
-            { "flags": 2, "x": 191, "y": 6 },
-            { "flags": 4, "matrix": [11, 5], "x": 185, "y": 0 },
-            { "flags": 4, "matrix": [11, 4], "x": 173, "y": 0 },
-            { "flags": 2, "x": 166, "y": 6 },
-            { "flags": 4, "matrix": [11, 3], "x": 160, "y": 0 },
-            { "flags": 4, "matrix": [11, 2], "x": 145, "y": 0 },
-            { "flags": 2, "x": 139, "y": 6 },
-            { "flags": 4, "matrix": [11, 1], "x": 133, "y": 0 },
-
-            { "flags": 4, "matrix": [6, 0], "x": 127, "y": 15 },
-            { "flags": 4, "matrix": [6, 1], "x": 139, "y": 15 },
-            { "flags": 4, "matrix": [6, 2], "x": 151, "y": 15 },
-            { "flags": 4, "matrix": [6, 3], "x": 163, "y": 15 },
-            { "flags": 4, "matrix": [6, 4], "x": 176, "y": 15 },
-            { "flags": 4, "matrix": [6, 5], "x": 188, "y": 15 },
-            { "flags": 4, "matrix": [6, 6], "x": 200, "y": 15 },
-            { "flags": 4, "matrix": [6, 7], "x": 212, "y": 15 },
-            { "flags": 4, "matrix": [6, 8], "x": 224, "y": 15 },
-
-            { "flags": 4, "matrix": [7, 8], "x": 224, "y": 27 },
-            { "flags": 4, "matrix": [7, 7], "x": 209, "y": 27 },
-            { "flags": 4, "matrix": [7, 6], "x": 194, "y": 27 },
-            { "flags": 4, "matrix": [7, 5], "x": 182, "y": 27 },
-            { "flags": 4, "matrix": [7, 4], "x": 170, "y": 27 },
-            { "flags": 4, "matrix": [7, 3], "x": 157, "y": 27 },
-            { "flags": 4, "matrix": [7, 2], "x": 145, "y": 27 },
-            { "flags": 4, "matrix": [7, 1], "x": 133, "y": 27 },
-            { "flags": 4, "matrix": [7, 0], "x": 121, "y": 27 },
-
-            { "flags": 4, "matrix": [8, 0], "x": 124, "y": 40 },
-            { "flags": 4, "matrix": [8, 1], "x": 136, "y": 40 },
-            { "flags": 4, "matrix": [8, 2], "x": 148, "y": 40 },
-            { "flags": 4, "matrix": [8, 3], "x": 160, "y": 40 },
-            { "flags": 4, "matrix": [8, 4], "x": 173, "y": 40 },
-            { "flags": 4, "matrix": [8, 5], "x": 185, "y": 40 },
-            { "flags": 4, "matrix": [8, 7], "x": 204, "y": 40 },
-            { "flags": 4, "matrix": [8, 8], "x": 224, "y": 40 },
-
-            { "flags": 4, "matrix": [9, 8], "x": 224, "y": 52 },
-            { "flags": 4, "matrix": [9, 7], "x": 212, "y": 52 },
-            { "flags": 4, "matrix": [9, 6], "x": 195, "y": 52 },
-            { "flags": 4, "matrix": [9, 4], "x": 179, "y": 52 },
-            { "flags": 4, "matrix": [9, 3], "x": 166, "y": 52 },
-            { "flags": 4, "matrix": [9, 2], "x": 154, "y": 52 },
-            { "flags": 4, "matrix": [9, 1], "x": 142, "y": 52 },
-            { "flags": 4, "matrix": [9, 0], "x": 130, "y": 52 },
-
-            { "flags": 2, "x": 133, "y": 64 },
-            { "flags": 4, "matrix": [10, 1], "x": 141, "y": 64 },
-            { "flags": 2, "x": 160, "y": 64 },
-            { "flags": 4, "matrix": [10, 2], "x": 163, "y": 64 },
-            { "flags": 4, "matrix": [10, 3], "x": 176, "y": 64 },
-            { "flags": 4, "matrix": [10, 4], "x": 188, "y": 64 },
-            { "flags": 2, "x": 194, "y": 64 },
-            { "flags": 4, "matrix": [10, 6], "x": 200, "y": 64 },
-            { "flags": 4, "matrix": [10, 7], "x": 212, "y": 64 },
-            { "flags": 4, "matrix": [10, 8], "x": 224, "y": 64 },
-            { "flags": 2, "x": 224, "y": 55 }
+            {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
+            {"flags": 2, "x": 42, "y": 6},
+            {"flags": 4, "matrix": [5, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [5, 4], "x": 58, "y": 0},
+            {"flags": 2, "x": 67, "y": 6},
+            {"flags": 4, "matrix": [5, 5], "x": 70, "y": 0},
+            {"flags": 4, "matrix": [5, 6], "x": 82, "y": 0},
+            {"flags": 4, "matrix": [5, 7], "x": 97, "y": 0},
+            {"flags": 2, "x": 103, "y": 6},
+            {"flags": 4, "matrix": [5, 8], "x": 109, "y": 0},
+
+            {"flags": 4, "matrix": [0, 8], "x": 103, "y": 15},
+            {"flags": 4, "matrix": [0, 7], "x": 91, "y": 15},
+            {"flags": 4, "matrix": [0, 6], "x": 79, "y": 15},
+            {"flags": 4, "matrix": [0, 5], "x": 67, "y": 15},
+            {"flags": 4, "matrix": [0, 4], "x": 54, "y": 15},
+            {"flags": 4, "matrix": [0, 3], "x": 42, "y": 15},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 15},
+
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 27},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 27},
+            {"flags": 4, "matrix": [1, 4], "x": 61, "y": 27},
+            {"flags": 4, "matrix": [1, 5], "x": 73, "y": 27},
+            {"flags": 4, "matrix": [1, 6], "x": 85, "y": 27},
+            {"flags": 4, "matrix": [1, 7], "x": 97, "y": 27},
+
+            {"flags": 4, "matrix": [2, 7], "x": 100, "y": 40},
+            {"flags": 4, "matrix": [2, 6], "x": 88, "y": 40},
+            {"flags": 4, "matrix": [2, 5], "x": 76, "y": 40},
+            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 40},
+            {"flags": 4, "matrix": [2, 3], "x": 51, "y": 40},
+            {"flags": 4, "matrix": [2, 2], "x": 35, "y": 40},
+
+            {"flags": 4, "matrix": [3, 2], "x": 38, "y": 52},
+            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 52},
+            {"flags": 4, "matrix": [3, 5], "x": 70, "y": 52},
+            {"flags": 4, "matrix": [3, 6], "x": 82, "y": 52},
+            {"flags": 4, "matrix": [3, 7], "x": 94, "y": 52},
+            {"flags": 4, "matrix": [3, 8], "x": 106, "y": 52},
+
+            {"flags": 2, "x": 106, "y": 64},
+            {"flags": 4, "matrix": [4, 7], "x": 98, "y": 64},
+            {"flags": 4, "matrix": [4, 5], "x": 77, "y": 64},
+            {"flags": 2, "x": 67, "y": 64},
+            {"flags": 4, "matrix": [4, 4], "x": 62, "y": 64},
+            {"flags": 4, "matrix": [4, 3], "x": 47, "y": 64},
+            {"flags": 2, "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 64},
+
+            {"flags": 4, "matrix": [4, 1], "x": 12, "y": 64},
+            {"flags": 2, "x": 6, "y": 64},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 64},
+
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 52},
+            {"flags": 4, "matrix": [3, 1], "x": 12, "y": 52},
+            {"flags": 4, "matrix": [2, 1], "x": 12, "y": 40},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 27},
+            {"flags": 4, "matrix": [1, 1], "x": 12, "y": 27},
+            {"flags": 4, "matrix": [0, 1], "x": 12, "y": 15},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 15},
+            {"flags": 4, "matrix": [5, 0], "x": 0, "y": 0},
+            {"flags": 2, "x": 9, "y": 0},
+
+            {"flags": 2, "x": 224, "y": 6},
+            {"flags": 4, "matrix": [11, 8], "x": 224, "y": 0},
+            {"flags": 4, "matrix": [11, 7], "x": 212, "y": 0},
+            {"flags": 4, "matrix": [11, 6], "x": 197, "y": 0},
+            {"flags": 2, "x": 191, "y": 6},
+            {"flags": 4, "matrix": [11, 5], "x": 185, "y": 0},
+            {"flags": 4, "matrix": [11, 4], "x": 173, "y": 0},
+            {"flags": 2, "x": 166, "y": 6},
+            {"flags": 4, "matrix": [11, 3], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [11, 2], "x": 145, "y": 0},
+            {"flags": 2, "x": 139, "y": 6},
+            {"flags": 4, "matrix": [11, 1], "x": 133, "y": 0},
+
+            {"flags": 4, "matrix": [6, 0], "x": 127, "y": 15},
+            {"flags": 4, "matrix": [6, 1], "x": 139, "y": 15},
+            {"flags": 4, "matrix": [6, 2], "x": 151, "y": 15},
+            {"flags": 4, "matrix": [6, 3], "x": 163, "y": 15},
+            {"flags": 4, "matrix": [6, 4], "x": 176, "y": 15},
+            {"flags": 4, "matrix": [6, 5], "x": 188, "y": 15},
+            {"flags": 4, "matrix": [6, 6], "x": 200, "y": 15},
+            {"flags": 4, "matrix": [6, 7], "x": 212, "y": 15},
+            {"flags": 4, "matrix": [6, 8], "x": 224, "y": 15},
+
+            {"flags": 4, "matrix": [7, 8], "x": 224, "y": 27},
+            {"flags": 4, "matrix": [7, 7], "x": 209, "y": 27},
+            {"flags": 4, "matrix": [7, 6], "x": 194, "y": 27},
+            {"flags": 4, "matrix": [7, 5], "x": 182, "y": 27},
+            {"flags": 4, "matrix": [7, 4], "x": 170, "y": 27},
+            {"flags": 4, "matrix": [7, 3], "x": 157, "y": 27},
+            {"flags": 4, "matrix": [7, 2], "x": 145, "y": 27},
+            {"flags": 4, "matrix": [7, 1], "x": 133, "y": 27},
+            {"flags": 4, "matrix": [7, 0], "x": 121, "y": 27},
+
+            {"flags": 4, "matrix": [8, 0], "x": 124, "y": 40},
+            {"flags": 4, "matrix": [8, 1], "x": 136, "y": 40},
+            {"flags": 4, "matrix": [8, 2], "x": 148, "y": 40},
+            {"flags": 4, "matrix": [8, 3], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [8, 4], "x": 173, "y": 40},
+            {"flags": 4, "matrix": [8, 5], "x": 185, "y": 40},
+            {"flags": 4, "matrix": [8, 7], "x": 204, "y": 40},
+            {"flags": 4, "matrix": [8, 8], "x": 224, "y": 40},
+
+            {"flags": 4, "matrix": [9, 8], "x": 224, "y": 52},
+            {"flags": 4, "matrix": [9, 7], "x": 212, "y": 52},
+            {"flags": 4, "matrix": [9, 6], "x": 195, "y": 52},
+            {"flags": 4, "matrix": [9, 4], "x": 179, "y": 52},
+            {"flags": 4, "matrix": [9, 3], "x": 166, "y": 52},
+            {"flags": 4, "matrix": [9, 2], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [9, 1], "x": 142, "y": 52},
+            {"flags": 4, "matrix": [9, 0], "x": 130, "y": 52},
+
+            {"flags": 2, "x": 133, "y": 64},
+            {"flags": 4, "matrix": [10, 1], "x": 141, "y": 64},
+            {"flags": 2, "x": 160, "y": 64},
+            {"flags": 4, "matrix": [10, 2], "x": 163, "y": 64},
+            {"flags": 4, "matrix": [10, 3], "x": 176, "y": 64},
+            {"flags": 4, "matrix": [10, 4], "x": 188, "y": 64},
+            {"flags": 2, "x": 194, "y": 64},
+            {"flags": 4, "matrix": [10, 6], "x": 200, "y": 64},
+            {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
+            {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
+            {"flags": 2, "x": 224, "y": 55}
           ]
     },
     "layouts": {

keyboards/keebio/tukey/info.json

@@ -21,8 +21,8 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {"x":0, "y":0, "matrix": [0, 0]},
-          {"x":1, "y":0, "matrix": [0, 1]}
+          {"x": 0, "y": 0, "matrix": [0, 0]},
+          {"x": 1, "y": 0, "matrix": [0, 1]}
         ]
       }
     }

keyboards/keebsforall/coarse60/info.json

@@ -1,7 +1,7 @@
 {
     "keyboard_name": "coarse60",
     "manufacturer": "KeebsForAll",
-    "url":"https://keebsforall.com",
+    "url": "https://keebsforall.com",
     "maintainer": "keebsforall",
     "usb": {
         "vid": "0x6B66",

keyboards/keebsforall/freebird75/info.json

@@ -26,436 +26,90 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "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": [1, 0],
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 1],
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 2],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 3],
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 4],
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 5],
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 6],
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 7],
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 8],
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 9],
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 10],
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 11],
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 12],
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 13],
-                    "x": 13,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [4, 14],
-                    "x": 14,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 14],
-                    "x": 15.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, 12],
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 13],
-                    "x": 13.5,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [2, 14],
-                    "x": 15.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": [3, 14],
-                    "x": 15.25,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [4, 0],
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [4, 1],
-                    "x": 1.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 2],
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 3],
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 4],
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 5],
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 6],
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 7],
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 8],
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 9],
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 10],
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 11],
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 12],
-                    "x": 12.25,
-                    "y": 4.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [4, 13],
-                    "x": 14.25,
-                    "y": 4.5
-                },
-                {
-                    "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, 6],
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "matrix": [5, 9],
-                    "x": 10,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 10],
-                    "x": 11,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 11],
-                    "x": 12,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 12],
-                    "x": 13.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [5, 13],
-                    "x": 14.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [5, 14],
-                    "x": 15.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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [4, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.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, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.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": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }