diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/info.json
index 008896d40e8..1f33c048c10 100644
--- a/keyboards/1upkeyboards/1upocarina/info.json
+++ b/keyboards/1upkeyboards/1upocarina/info.json
@@ -126,11 +126,11 @@
     "layouts": {
         "LAYOUT_1x5": {
             "layout": [
-                { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }
+                { "label": "z", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "x", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "esc", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "c", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "v", "matrix": [0, 4], "x": 4, "y": 0 }
             ]
         }
     }
diff --git a/keyboards/ah/haven80/hotswap/info.json b/keyboards/ah/haven80/hotswap/info.json
index b73da1c5f4c..e740857bcb1 100644
--- a/keyboards/ah/haven80/hotswap/info.json
+++ b/keyboards/ah/haven80/hotswap/info.json
@@ -105,7 +105,7 @@
               { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
               { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
               { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25},
               { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
               { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
               { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
diff --git a/keyboards/ah/haven80/solder/info.json b/keyboards/ah/haven80/solder/info.json
index 775908d24f0..686c091727d 100644
--- a/keyboards/ah/haven80/solder/info.json
+++ b/keyboards/ah/haven80/solder/info.json
@@ -108,7 +108,7 @@
               { "label": "lalt",            "matrix":[10,2],"x": 2.5, "y": 5.25, "w": 1.5 },
               { "label": "space",           "matrix":[10,3],"x": 4, "y": 5.25, "w": 7 },
               { "label": "ralt",            "matrix":[10,5],"x": 11, "y": 5.25, "w": 1.5 },
-              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25, "w": 1 },
+              { "label": "rwin",            "matrix":[10,6],"x": 12.5, "y": 5.25},
               { "label": "rctrl",           "matrix":[10,7],"x": 13.5, "y": 5.25, "w":1.5},
               { "label": "left",            "matrix":[9,2],"x": 15.25, "y": 5.25 },
               { "label": "down",            "matrix":[9,1],"x": 16.25, "y": 5.25 },
diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/info.json
index a11daef092d..dea56ed2570 100644
--- a/keyboards/custommk/evo70_r2/info.json
+++ b/keyboards/custommk/evo70_r2/info.json
@@ -121,7 +121,7 @@
                 {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
                 {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
                 {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
                 {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
                 {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
                 {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
@@ -286,7 +286,7 @@
                 {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3},
                 {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3},
                 {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
-                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1},
+                {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3},
                 {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3},
                 {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3},
                 {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3},
diff --git a/keyboards/enviousdesign/delirium/rgb/info.json b/keyboards/enviousdesign/delirium/rgb/info.json
index ad7d45d3cf7..b6e0bb0e0c5 100644
--- a/keyboards/enviousdesign/delirium/rgb/info.json
+++ b/keyboards/enviousdesign/delirium/rgb/info.json
@@ -145,83 +145,83 @@
     "layouts": {
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
-                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
-                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
-                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
-                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
-                {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0, "w": 1},
-                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0, "w": 1},
-                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0, "w": 1},
-                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0, "w": 1},
-                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
-                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0, "w": 1},
-                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0, "w": 1},
-                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0, "w": 1},
-                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0, "w": 1},
-                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0, "w": 1},
-                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0, "w": 1},
-                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5, "w": 1},
-                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5, "w": 1},
-                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5, "w": 1},
-                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5, "w": 1},
-                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5, "w": 1},
-                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5, "w": 1},
-                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5, "w": 1},
-                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5, "w": 1},
-                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5, "w": 1},
-                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5, "w": 1},
-                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5, "w": 1},
-                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5, "w": 1},
-                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5, "w": 1},
+                {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "0,7", "matrix": [0, 7], "x": 6.5, "y": 0},
+                {"label": "0,8", "matrix": [0, 8], "x": 7.5, "y": 0},
+                {"label": "0,9", "matrix": [0, 9], "x": 8.5, "y": 0},
+                {"label": "0,10", "matrix": [0, 10], "x": 9.5, "y": 0},
+                {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "0,15", "matrix": [0, 15], "x": 15.25, "y": 0},
+                {"label": "0,16", "matrix": [0, 16], "x": 16.25, "y": 0},
+                {"label": "0,17", "matrix": [0, 17], "x": 17.25, "y": 0},
+                {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.5},
+                {"label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.5},
+                {"label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.5},
+                {"label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.5},
                 {"label": "1,14", "matrix": [1, 14], "x": 13, "y": 1.5, "w": 2},
-                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5, "w": 1},
-                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5, "w": 1},
-                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5, "w": 1},
+                {"label": "1,15", "matrix": [1, 15], "x": 15.25, "y": 1.5},
+                {"label": "1,16", "matrix": [1, 16], "x": 16.25, "y": 1.5},
+                {"label": "1,17", "matrix": [1, 17], "x": 17.25, "y": 1.5},
                 {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
-                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5, "w": 1},
-                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5, "w": 1},
-                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5, "w": 1},
-                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5, "w": 1},
-                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5, "w": 1},
-                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5, "w": 1},
-                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5, "w": 1},
-                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5, "w": 1},
-                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5, "w": 1},
-                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5, "w": 1},
-                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5, "w": 1},
-                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5, "w": 1},
-                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5, "w": 1},
-                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5, "w": 1},
-                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5, "w": 1},
+                {"label": "2,2", "matrix": [2, 2], "x": 1.5, "y": 2.5},
+                {"label": "2,3", "matrix": [2, 3], "x": 2.5, "y": 2.5},
+                {"label": "2,4", "matrix": [2, 4], "x": 3.5, "y": 2.5},
+                {"label": "2,5", "matrix": [2, 5], "x": 4.5, "y": 2.5},
+                {"label": "2,6", "matrix": [2, 6], "x": 5.5, "y": 2.5},
+                {"label": "2,7", "matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"label": "2,8", "matrix": [2, 8], "x": 7.5, "y": 2.5},
+                {"label": "2,9", "matrix": [2, 9], "x": 8.5, "y": 2.5},
+                {"label": "2,10", "matrix": [2, 10], "x": 9.5, "y": 2.5},
+                {"label": "2,11", "matrix": [2, 11], "x": 10.5, "y": 2.5},
+                {"label": "2,12", "matrix": [2, 12], "x": 11.5, "y": 2.5},
+                {"label": "2,13", "matrix": [2, 13], "x": 12.5, "y": 2.5},
+                {"label": "2,15", "matrix": [2, 15], "x": 15.25, "y": 2.5},
+                {"label": "2,16", "matrix": [2, 16], "x": 16.25, "y": 2.5},
+                {"label": "2,17", "matrix": [2, 17], "x": 17.25, "y": 2.5},
                 {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
-                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5, "w": 1},
-                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5, "w": 1},
-                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5, "w": 1},
-                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5, "w": 1},
-                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5, "w": 1},
-                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5, "w": 1},
-                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5, "w": 1},
-                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5, "w": 1},
-                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5, "w": 1},
-                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5, "w": 1},
-                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5, "w": 1},
-                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 1},
+                {"label": "3,2", "matrix": [3, 2], "x": 1.75, "y": 3.5},
+                {"label": "3,3", "matrix": [3, 3], "x": 2.75, "y": 3.5},
+                {"label": "3,4", "matrix": [3, 4], "x": 3.75, "y": 3.5},
+                {"label": "3,5", "matrix": [3, 5], "x": 4.75, "y": 3.5},
+                {"label": "3,6", "matrix": [3, 6], "x": 5.75, "y": 3.5},
+                {"label": "3,7", "matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"label": "3,8", "matrix": [3, 8], "x": 7.75, "y": 3.5},
+                {"label": "3,9", "matrix": [3, 9], "x": 8.75, "y": 3.5},
+                {"label": "3,10", "matrix": [3, 10], "x": 9.75, "y": 3.5},
+                {"label": "3,11", "matrix": [3, 11], "x": 10.75, "y": 3.5},
+                {"label": "3,12", "matrix": [3, 12], "x": 11.75, "y": 3.5},
+                {"label": "3,13", "matrix": [3, 13], "x": 12.75, "y": 3.5},
                 {"label": "3,14", "matrix": [3, 14], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
                 {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
-                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1},
-                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5, "w": 1},
-                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5, "w": 1},
-                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5, "w": 1},
-                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5, "w": 1},
-                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1},
-                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5, "w": 1},
-                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5, "w": 1},
-                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5, "w": 1},
-                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5, "w": 1},
-                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5, "w": 1},
+                {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.5},
+                {"label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"label": "4,5", "matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"label": "4,6", "matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"label": "4,7", "matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"label": "4,8", "matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"label": "4,9", "matrix": [4, 9], "x": 9.25, "y": 4.5},
+                {"label": "4,10", "matrix": [4, 10], "x": 10.25, "y": 4.5},
+                {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.5},
                 {"label": "4,13", "matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75},
-                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5, "w": 1},
+                {"label": "4,16", "matrix": [4, 16], "x": 16.25, "y": 4.5},
                 {"label": "5,0", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
                 {"label": "5,1", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
                 {"label": "5,3", "matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25},
@@ -230,9 +230,9 @@
                 {"label": "5,11", "matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25},
                 {"label": "5,13", "matrix": [5, 13], "x": 12.5, "y": 5.5, "w": 1.25},
                 {"label": "5,14", "matrix": [5, 14], "x": 13.75, "y": 5.5, "w": 1.25},
-                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5, "w": 1},
-                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5, "w": 1},
-                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5, "w": 1}
+                {"label": "5,15", "matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"label": "5,16", "matrix": [5, 16], "x": 16.25, "y": 5.5},
+                {"label": "5,17", "matrix": [5, 17], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/enviousdesign/mcro/rev1/info.json b/keyboards/enviousdesign/mcro/rev1/info.json
index fe6a4ffe77c..c7e4c38765a 100644
--- a/keyboards/enviousdesign/mcro/rev1/info.json
+++ b/keyboards/enviousdesign/mcro/rev1/info.json
@@ -26,18 +26,18 @@
     "layouts": {
         "LAYOUT_ortho_3x4": {
             "layout": [
-                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
-                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
-                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
-                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
-                {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1},
-                {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25, "w": 1},
-                {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25, "w": 1},
-                {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25, "w": 1},
-                {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1},
-                {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5, "w": 1},
-                {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5, "w": 1},
-                {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5, "w": 1}
+                {"label": "F13", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F14", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "F15", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "F16", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "F17", "matrix": [1, 0], "x": 0, "y": 1.25},
+                {"label": "F18", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "F19", "matrix": [1, 2], "x": 2, "y": 1.25},
+                {"label": "F20", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "F21", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "F22", "matrix": [2, 1], "x": 1, "y": 2.5},
+                {"label": "F23", "matrix": [2, 2], "x": 2, "y": 2.5},
+                {"label": "F24", "matrix": [2, 3], "x": 3, "y": 2.5}
             ]
         }
     }
diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/info.json
index a43aca34643..ef863b3b520 100644
--- a/keyboards/handwired/3dp660_oled/info.json
+++ b/keyboards/handwired/3dp660_oled/info.json
@@ -31,62 +31,62 @@
     "layouts": {
         "LAYOUT_66_ansi": {
           "layout": [
-            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "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": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
             { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-            { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Page Up", "matrix": [5, 7], "x": 15.5, "y": 0 },
             { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "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": [6, 0], "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
             { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-            { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "Page Down", "matrix": [6, 7], "x": 15.5, "y": 1 },
             { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
+            { "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": [7, 0], "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
             { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
             { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.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": [8, 0], "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
             { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-            { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "Up", "matrix": [8, 6], "x": 14.5, "y": 3 },
             { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
             { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
             { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -94,70 +94,70 @@
             { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
             { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
             { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-            { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-            { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-            { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+            { "label": "Left", "matrix": [9, 5], "x": 13.5, "y": 4 },
+            { "label": "Down", "matrix": [9, 6], "x": 14.5, "y": 4 },
+            { "label": "Up", "matrix": [9, 7], "x": 15.5, "y": 4 }
           ]
         },
         "LAYOUT_66_iso": {
           "layout": [
-            { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-            { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-            { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-            { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-            { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-            { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-            { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-            { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-            { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-            { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-            { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-            { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-            { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
+            { "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": 6, "y": 0 },
+            { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+            { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+            { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+            { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+            { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+            { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
             { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
-            { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 },
             { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-            { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-            { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
-            { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "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": [6, 0], "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+            { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+            { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+            { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 },
             { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-            { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-            { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-            { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "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": [7, 0], "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+            { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+            { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+            { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 },
             { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
             { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-            { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-            { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-            { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-            { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
+            { "label": "\\", "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": [8, 0], "x": 8.25, "y": 3 },
+            { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+            { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+            { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
             { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
-            { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 },
             { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
             { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
             { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
@@ -165,86 +165,86 @@
             { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
             { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
             { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-            { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-            { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-            { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+            { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 },
+            { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 },
+            { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 }
           ]
         },
         "LAYOUT_all": {
           "layout": [
-            { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-            { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-            { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-            { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-            { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-            { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-            { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-            { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-            { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
-            { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
-            { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
-            { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
-            { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
-            { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
-            { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
-            { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
+            { "label": "GRAVE", "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": [5, 0], "x": 8, "y": 0 },
+            { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 },
+            { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 },
+            { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 },
+            { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 },
+            { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 },
+            { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 },
+            { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 },
             { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-            { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-            { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-            { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-            { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-            { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-            { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-            { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-            { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
-            { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
-            { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
-            { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
-            { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
+            { "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": [6, 0], "x": 8.5, "y": 1 },
+            { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+            { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+            { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 },
+            { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 },
             { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
-            { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
+            { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 },
             { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-            { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-            { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-            { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-            { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-            { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-            { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-            { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-            { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
-            { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
-            { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
-            { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
-            { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
+            { "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": [7, 0], "x": 8.75, "y": 2 },
+            { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+            { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 },
+            { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 },
+            { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 },
             { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
             { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
-            { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
-            { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
-            { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
-            { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
-            { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
-            { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
-            { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
-            { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
-            { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
-            { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
-            { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
-            { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
+            { "label": "ISOBACKSLASH", "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": [8, 0], "x": 8.25, "y": 3 },
+            { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 },
+            { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 },
+            { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 },
+            { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 },
             { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
-            { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
+            { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 },
             { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-            { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
+            { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
             { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
             { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
             { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
             { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
             { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
             { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
-            { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
+            { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 },
             { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
-            { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
-            { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
-            { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
+            { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 },
+            { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 },
+            { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 }
           ]
         }
     }
diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/info.json
index 5cfa0b0efb8..070a69f6917 100644
--- a/keyboards/hazel/bad_wings/info.json
+++ b/keyboards/hazel/bad_wings/info.json
@@ -24,42 +24,42 @@
   "layouts": {
     "LAYOUT_split_3x5_3": {
       "layout": [
-        {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0.75},
-        {"label": "K10", "matrix": [1, 0], "w": 1, "x": 1, "y": 0.5},
-        {"label": "K20", "matrix": [2, 0], "w": 1, "x": 2, "y": 0},
-        {"label": "K30", "matrix": [3, 0], "w": 1, "x": 3, "y": 0.25},
-        {"label": "K40", "matrix": [4, 0], "w": 1, "x": 4, "y": 0.36},
-        {"label": "K44", "matrix": [4, 4], "w": 1, "x": 8, "y": 0.36},
-        {"label": "K34", "matrix": [3, 4], "w": 1, "x": 9, "y": 0.25},
-        {"label": "K24", "matrix": [2, 4], "w": 1, "x": 10, "y": 0},
-        {"label": "K14", "matrix": [1, 4], "w": 1, "x": 11, "y": 0.5},
-        {"label": "K04", "matrix": [0, 4], "w": 1, "x": 12, "y": 0.75},
-        {"label": "K01", "matrix": [0, 1], "w": 1, "x": 0, "y": 1.75},
-        {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5},
-        {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2, "y": 1},
-        {"label": "K31", "matrix": [3, 1], "w": 1, "x": 3, "y": 1.25},
-        {"label": "K41", "matrix": [4, 1], "w": 1, "x": 4, "y": 1.36},
-        {"label": "K45", "matrix": [4, 5], "w": 1, "x": 8, "y": 1.36},
-        {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9, "y": 1.25},
-        {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10, "y": 1},
-        {"label": "K15", "matrix": [1, 5], "w": 1, "x": 11, "y": 1.5},
-        {"label": "K05", "matrix": [0, 5], "w": 1, "x": 12, "y": 1.75},
-        {"label": "K02", "matrix": [0, 2], "w": 1, "x": 0, "y": 2.75},
-        {"label": "K12", "matrix": [1, 2], "w": 1, "x": 1, "y": 2.5},
-        {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2},
-        {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3, "y": 2.25},
-        {"label": "K42", "matrix": [4, 2], "w": 1, "x": 4, "y": 2.36},
-        {"label": "K46", "matrix": [4, 6], "w": 1, "x": 8, "y": 2.36},
-        {"label": "K36", "matrix": [3, 6], "w": 1, "x": 9, "y": 2.25},
-        {"label": "K26", "matrix": [2, 6], "w": 1, "x": 10, "y": 2},
-        {"label": "K16", "matrix": [1, 6], "w": 1, "x": 11, "y": 2.5},
-        {"label": "K06", "matrix": [0, 6], "w": 1, "x": 12, "y": 2.75},
-        {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 3.25},
-        {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4, "y": 3.36},
-        {"label": "K43", "matrix": [4, 3], "w": 1, "x": 5, "y": 3.47},
-        {"label": "K47", "matrix": [4, 7], "w": 1, "x": 7, "y": 3.47},
-        {"label": "K37", "matrix": [3, 7], "w": 1, "x": 8, "y": 3.36},
-        {"label": "K27", "matrix": [2, 7], "w": 1, "x": 9, "y": 3.25}
+        {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0.75},
+        {"label": "K10", "matrix": [1, 0], "x": 1, "y": 0.5},
+        {"label": "K20", "matrix": [2, 0], "x": 2, "y": 0},
+        {"label": "K30", "matrix": [3, 0], "x": 3, "y": 0.25},
+        {"label": "K40", "matrix": [4, 0], "x": 4, "y": 0.36},
+        {"label": "K44", "matrix": [4, 4], "x": 8, "y": 0.36},
+        {"label": "K34", "matrix": [3, 4], "x": 9, "y": 0.25},
+        {"label": "K24", "matrix": [2, 4], "x": 10, "y": 0},
+        {"label": "K14", "matrix": [1, 4], "x": 11, "y": 0.5},
+        {"label": "K04", "matrix": [0, 4], "x": 12, "y": 0.75},
+        {"label": "K01", "matrix": [0, 1], "x": 0, "y": 1.75},
+        {"label": "K11", "matrix": [1, 1], "x": 1, "y": 1.5},
+        {"label": "K21", "matrix": [2, 1], "x": 2, "y": 1},
+        {"label": "K31", "matrix": [3, 1], "x": 3, "y": 1.25},
+        {"label": "K41", "matrix": [4, 1], "x": 4, "y": 1.36},
+        {"label": "K45", "matrix": [4, 5], "x": 8, "y": 1.36},
+        {"label": "K35", "matrix": [3, 5], "x": 9, "y": 1.25},
+        {"label": "K25", "matrix": [2, 5], "x": 10, "y": 1},
+        {"label": "K15", "matrix": [1, 5], "x": 11, "y": 1.5},
+        {"label": "K05", "matrix": [0, 5], "x": 12, "y": 1.75},
+        {"label": "K02", "matrix": [0, 2], "x": 0, "y": 2.75},
+        {"label": "K12", "matrix": [1, 2], "x": 1, "y": 2.5},
+        {"label": "K22", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "K32", "matrix": [3, 2], "x": 3, "y": 2.25},
+        {"label": "K42", "matrix": [4, 2], "x": 4, "y": 2.36},
+        {"label": "K46", "matrix": [4, 6], "x": 8, "y": 2.36},
+        {"label": "K36", "matrix": [3, 6], "x": 9, "y": 2.25},
+        {"label": "K26", "matrix": [2, 6], "x": 10, "y": 2},
+        {"label": "K16", "matrix": [1, 6], "x": 11, "y": 2.5},
+        {"label": "K06", "matrix": [0, 6], "x": 12, "y": 2.75},
+        {"label": "K23", "matrix": [2, 3], "x": 3, "y": 3.25},
+        {"label": "K33", "matrix": [3, 3], "x": 4, "y": 3.36},
+        {"label": "K43", "matrix": [4, 3], "x": 5, "y": 3.47},
+        {"label": "K47", "matrix": [4, 7], "x": 7, "y": 3.47},
+        {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.36},
+        {"label": "K27", "matrix": [2, 7], "x": 9, "y": 3.25}
       ]
     }
   }
diff --git a/keyboards/kopibeng/mnk60/info.json b/keyboards/kopibeng/mnk60/info.json
index 430fc66c1bc..0477ac560db 100644
--- a/keyboards/kopibeng/mnk60/info.json
+++ b/keyboards/kopibeng/mnk60/info.json
@@ -375,11 +375,11 @@
                 { "matrix": [3, 11], "x": 11.25, "y": 3 },
                 { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
                 { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
                 { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
                 { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
                 { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         },
@@ -442,11 +442,11 @@
                 { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
                 { "matrix": [3, 13], "x": 14, "y": 3 },
                 { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
                 { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
                 { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
                 { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         },
@@ -779,11 +779,11 @@
                 { "matrix": [3, 11], "x": 11.25, "y": 3 },
                 { "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3 },
                 { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
                 { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
                 { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
                 { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         },
@@ -846,11 +846,11 @@
                 { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
                 { "matrix": [3, 13], "x": 14, "y": 3 },
                 { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
                 { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
                 { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
                 { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 12.5, "y": 4 },
+                { "matrix": [4, 12], "x": 12.5, "y": 4 },
                 { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         },
diff --git a/keyboards/laneware/lpad/keyboard.json b/keyboards/laneware/lpad/keyboard.json
index 473a6552c5d..d143b363b30 100644
--- a/keyboards/laneware/lpad/keyboard.json
+++ b/keyboards/laneware/lpad/keyboard.json
@@ -32,12 +32,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "Mute", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.5},
-                {"label": "Next", "matrix": [1, 0], "w": 1, "x": 0, "y": 1},
-                {"label": "Prev", "matrix": [2, 0], "w": 1, "x": 0, "y": 2},
-                {"label": "Left", "matrix": [2, 1], "w": 1, "x": 1, "y": 2},
-                {"label": "Rght", "matrix": [2, 2], "w": 1, "x": 2, "y": 2}
+                {"label": "Play", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Mute", "matrix": [0, 1], "x": 1.5, "y": 0.5},
+                {"label": "Next", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "Prev", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "Left", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "Rght", "matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/latincompass/latin60rgb/keyboard.json b/keyboards/latincompass/latin60rgb/keyboard.json
index 6c9bfdc47b4..3197b3979d3 100644
--- a/keyboards/latincompass/latin60rgb/keyboard.json
+++ b/keyboards/latincompass/latin60rgb/keyboard.json
@@ -117,9 +117,9 @@
         {"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, "w": 1},
-        {"matrix": [3, 12], "x": 13, "y": 3, "w": 1},
-        {"matrix": [3, 13], "x": 14, "y": 3, "w": 1},
+        {"matrix": [3, 11], "x": 12, "y": 3},
+        {"matrix": [3, 12], "x": 13, "y": 3},
+        {"matrix": [3, 13], "x": 14, "y": 3},
 
         {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25},
         {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.25},
diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json
index b94b4160162..569204d1a02 100644
--- a/keyboards/lucid/velvet_solder/info.json
+++ b/keyboards/lucid/velvet_solder/info.json
@@ -96,7 +96,7 @@
                 {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
 
                 {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "label": "Left Shift", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 1], "label": "Left Shift", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
@@ -494,7 +494,7 @@
                 {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
@@ -593,7 +593,7 @@
                 {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
@@ -693,7 +693,7 @@
                 {"matrix": [2, 13], "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
                 {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25},
                 {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
                 {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
                 {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
diff --git a/keyboards/mokey/luckycat70/info.json b/keyboards/mokey/luckycat70/info.json
index 0f3ec996fbc..2f9ab6a1e59 100644
--- a/keyboards/mokey/luckycat70/info.json
+++ b/keyboards/mokey/luckycat70/info.json
@@ -76,7 +76,7 @@
                 {"matrix": [1, 6], "x": 10.5, "y": 1},
                 {"matrix": [1, 5], "x": 11.5, "y": 1},
                 {"matrix": [1, 4], "x": 12.5, "y": 1},
-                {"matrix": [1, 3], "x": 13.5, "y": 1, "w": 1, "h": 1.5},
+                {"matrix": [1, 3], "x": 13.5, "y": 1, "h": 1.5},
                 {"matrix": [1, 2], "x": 15.25, "y": 1},
                 {"matrix": [1, 1], "x": 16.25, "y": 1},
                 {"matrix": [1, 0], "x": 17.25, "y": 1},
diff --git a/keyboards/phentech/rpk_001/info.json b/keyboards/phentech/rpk_001/info.json
index d61c83607a1..0ce29938972 100644
--- a/keyboards/phentech/rpk_001/info.json
+++ b/keyboards/phentech/rpk_001/info.json
@@ -229,8 +229,8 @@
                 { "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, 8], "w": 1, "x": 10, "y": 4 },
-                { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 },
+                { "matrix": [4, 8], "x": 10, "y": 4 },
+                { "matrix": [4, 9], "x": 11, "y": 4 },
                 { "matrix": [4, 10], "w": 1.25, "x": 12, "y": 4 },
                 { "matrix": [4, 11], "x": 13.5, "y": 4 },
                 { "matrix": [4, 13], "x": 14.5, "y": 4 },
diff --git a/keyboards/skyloong/gk61/pro/info.json b/keyboards/skyloong/gk61/pro/info.json
index 7d507f1e8ca..5a2302a92c4 100644
--- a/keyboards/skyloong/gk61/pro/info.json
+++ b/keyboards/skyloong/gk61/pro/info.json
@@ -136,7 +136,7 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -204,7 +204,7 @@
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -269,7 +269,7 @@
         },
         "LAYOUT_60_ansi_split_space": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
diff --git a/keyboards/skyloong/gk61/pro_48/info.json b/keyboards/skyloong/gk61/pro_48/info.json
index 10a663f3c71..0c7065ec489 100644
--- a/keyboards/skyloong/gk61/pro_48/info.json
+++ b/keyboards/skyloong/gk61/pro_48/info.json
@@ -137,7 +137,7 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -205,7 +205,7 @@
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -270,7 +270,7 @@
         },
         "LAYOUT_60_ansi_split_space": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
diff --git a/keyboards/skyloong/gk61/v1/info.json b/keyboards/skyloong/gk61/v1/info.json
index d5320fa7655..0bafe1bd4ef 100644
--- a/keyboards/skyloong/gk61/v1/info.json
+++ b/keyboards/skyloong/gk61/v1/info.json
@@ -128,7 +128,7 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -196,7 +196,7 @@
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
@@ -261,7 +261,7 @@
         },
         "LAYOUT_60_ansi_split_space": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1},
+                {"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},
diff --git a/keyboards/snes_macropad/info.json b/keyboards/snes_macropad/info.json
index 15e3c9ee678..3483fe8f539 100644
--- a/keyboards/snes_macropad/info.json
+++ b/keyboards/snes_macropad/info.json
@@ -47,8 +47,8 @@
 
                 {"matrix": [3, 0], "x": 5.2, "y": 0, "w": 2, "h": 0.75},
                 {"matrix": [3, 1], "x": 10.65, "y": 0, "w": 2, "h": 0.75},
-                {"matrix": [3, 2], "x": 7.9, "y": 2.5, "w": 1, "h": 0.75},
-                {"matrix": [3, 3], "x": 8.9, "y": 2.5, "w": 1, "h": 0.75},
+                {"matrix": [3, 2], "x": 7.9, "y": 2.5, "h": 0.75},
+                {"matrix": [3, 3], "x": 8.9, "y": 2.5, "h": 0.75},
                 {"matrix": [4, 0], "x": 6, "y": 1, "w": 0.85, "h": 0.85},
                 {"matrix": [4, 1], "x": 6, "y": 3, "w": 0.85, "h": 0.85},
                 {"matrix": [4, 2], "x": 5.2, "y": 2, "w": 0.85, "h": 0.85},
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json
index 04baad7d00b..4b64ba96d18 100644
--- a/keyboards/teahouse/ayleen/info.json
+++ b/keyboards/teahouse/ayleen/info.json
@@ -129,7 +129,7 @@
                 {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.25, "w": 1.5},
                 {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.25, "w": 7},
                 {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.25, "w": 1.5},
-                {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.25, "w": 1},
+                {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.25},
                 {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.25, "w": 1.5},
                 {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.25},
                 {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.25},
diff --git a/keyboards/varanidae/info.json b/keyboards/varanidae/info.json
index f35e061dcf0..ca6480d4da2 100644
--- a/keyboards/varanidae/info.json
+++ b/keyboards/varanidae/info.json
@@ -35,480 +35,480 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 },
+                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 },
-                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 },
-                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 },
-                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 },
-                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 },
-                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 },
-                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 },
-                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 },
-                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 },
-                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 },
-                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 },
-                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 },
-                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 },
-                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 },
-                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 },
-                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 },
-                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 },
-                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 },
-                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 },
+                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0},
+                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0},
+                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0},
+                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0},
+                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0},
+                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0},
+                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0},
+                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0},
+                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0},
+                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0},
+                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0},
+                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0},
+                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0},
+                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0},
+                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0},
+                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0},
+                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0},
+                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0},
+                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0},
 
-                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 },
-                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 },
-                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 },
-                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 },
-                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 },
-                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 },
-                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 },
-                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 },
-                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 },
-                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 },
-                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 },
-                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 },
-                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 },
-                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 },
-                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 },
-                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 },
-                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 },
-                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 },
+                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1},
+                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1},
+                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1},
+                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1},
+                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1},
+                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25},
+                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25},
+                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25},
+                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25},
+                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25},
+                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25},
+                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25},
+                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25},
+                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25},
+                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25},
+                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25},
+                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25},
+                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25},
                 { "label":"Backspace", "matrix": [7, 5], "x": 18.25, "y": 1.25, "w": 2 },
 
-                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 },
-                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 },
-                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 },
-                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 },
-                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 },
+                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25},
+                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25},
+                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25},
+                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25},
+                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25},
                 { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 },
-                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 },
-                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 },
-                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 },
-                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 },
-                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 },
-                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 },
-                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 },
-                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 },
-                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 },
-                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 },
-                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 },
-                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 },
+                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25},
+                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25},
+                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25},
+                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25},
+                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25},
+                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25},
+                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25},
+                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25},
+                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25},
+                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25},
+                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25},
+                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25},
                 { "label":"\\", "matrix": [10, 3], "x": 18.75, "y": 2.25, "w": 1.5 },
 
-                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 },
-                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 },
-                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 },
-                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 },
-                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 },
+                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25},
+                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25},
+                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25},
+                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25},
+                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25},
                 { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 },
-                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 },
-                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 },
-                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 },
-                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 },
-                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 },
-                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 },
-                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 },
-                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 },
-                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 },
-                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 },
-                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 },
+                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25},
+                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25},
+                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25},
+                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25},
+                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25},
+                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25},
+                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25},
+                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25},
+                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25},
+                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25},
+                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25},
                 { "label":"Enter", "matrix": [9, 4], "x": 18, "y": 3.25, "w": 2.25},
 
-                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 },
-                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 },
-                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 },
-                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 },
-                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 },
+                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25},
+                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25},
+                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25},
+                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25},
+                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25},
                 { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 2.25},
-                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 },
-                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 },
-                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 },
-                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 },
-                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 },
-                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 },
-                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 },
-                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 },
-                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 },
-                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 },
+                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25},
+                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25},
+                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25},
+                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25},
+                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25},
+                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25},
+                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25},
+                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25},
+                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25},
+                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25},
                 { "label":"Shift", "matrix": [8, 5], "x": 17.5, "y": 4.25, "w": 2.75 },
 
-                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 },
-                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 },
-                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 },
-                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 },
-                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 },
-                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 },
-                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 },
-                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 },
-                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 },
+                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25},
+                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25},
+                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25},
+                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25},
+                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25},
+                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25},
+                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25},
+                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25},
+                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25},
                 { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 },
-                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 },
-                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 },
-                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 },
-                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 },
-                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 }
+                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25},
+                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25},
+                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25},
+                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25},
+                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25}
             ]
         },
         "LAYOUT_ansi_split_bs_rshift": {
             "layout": [
-                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 },
+                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 },
-                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 },
-                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 },
-                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 },
-                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 },
-                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 },
-                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 },
-                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 },
-                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 },
-                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 },
-                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 },
-                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 },
-                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 },
-                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 },
-                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 },
-                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 },
-                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 },
-                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 },
-                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 },
+                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0},
+                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0},
+                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0},
+                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0},
+                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0},
+                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0},
+                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0},
+                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0},
+                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0},
+                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0},
+                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0},
+                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0},
+                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0},
+                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0},
+                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0},
+                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0},
+                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0},
+                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0},
+                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0},
 
-                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 },
-                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 },
-                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 },
-                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 },
-                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 },
-                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 },
-                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 },
-                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 },
-                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 },
-                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 },
-                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 },
-                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 },
-                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 },
-                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 },
-                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 },
-                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 },
-                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 },
-                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 },
-                { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25, "w": 1 },
-                { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25, "w": 1 },
+                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1},
+                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1},
+                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1},
+                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1},
+                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1},
+                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25},
+                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25},
+                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25},
+                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25},
+                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25},
+                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25},
+                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25},
+                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25},
+                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25},
+                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25},
+                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25},
+                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25},
+                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25},
+                { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25},
+                { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25},
 
-                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 },
-                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 },
-                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 },
-                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 },
-                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 },
+                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25},
+                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25},
+                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25},
+                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25},
+                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25},
                 { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 },
-                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 },
-                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 },
-                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 },
-                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 },
-                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 },
-                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 },
-                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 },
-                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 },
-                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 },
-                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 },
-                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 },
-                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 },
+                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25},
+                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25},
+                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25},
+                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25},
+                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25},
+                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25},
+                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25},
+                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25},
+                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25},
+                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25},
+                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25},
+                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25},
                 { "label":"\\", "matrix": [10, 3], "x": 18.75, "y": 2.25, "w": 1.5 },
 
-                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 },
-                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 },
-                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 },
-                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 },
-                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 },
+                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25},
+                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25},
+                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25},
+                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25},
+                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25},
                 { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 },
-                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 },
-                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 },
-                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 },
-                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 },
-                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 },
-                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 },
-                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 },
-                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 },
-                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 },
-                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 },
-                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 },
+                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25},
+                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25},
+                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25},
+                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25},
+                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25},
+                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25},
+                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25},
+                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25},
+                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25},
+                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25},
+                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25},
                 { "label":"Enter", "matrix": [9, 4], "x": 18, "y": 3.25, "w": 2.25},
 
-                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 },
-                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 },
-                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 },
-                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 },
-                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 },
+                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25},
+                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25},
+                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25},
+                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25},
+                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25},
                 { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 2.25},
-                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 },
-                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 },
-                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 },
-                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 },
-                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 },
-                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 },
-                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 },
-                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 },
-                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 },
-                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 },
-                { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25, "w": 1 },
+                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25},
+                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25},
+                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25},
+                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25},
+                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25},
+                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25},
+                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25},
+                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25},
+                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25},
+                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25},
+                { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25},
                 { "label":"Shift", "matrix": [8, 5], "x": 18.5, "y": 4.25, "w": 1.75 },
 
-                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 },
-                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 },
-                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 },
-                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 },
-                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 },
-                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 },
-                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 },
-                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 },
-                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 },
+                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25},
+                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25},
+                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25},
+                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25},
+                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25},
+                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25},
+                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25},
+                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25},
+                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25},
                 { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 },
-                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 },
-                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 },
-                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 },
-                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 },
-                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 }
+                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25},
+                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25},
+                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25},
+                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25},
+                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 },
+                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 },
-                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 },
-                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 },
-                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 },
-                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 },
-                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 },
-                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 },
-                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 },
-                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 },
-                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 },
-                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 },
-                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 },
-                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 },
-                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 },
-                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 },
-                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 },
-                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 },
-                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 },
-                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 },
+                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0},
+                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0},
+                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0},
+                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0},
+                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0},
+                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0},
+                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0},
+                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0},
+                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0},
+                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0},
+                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0},
+                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0},
+                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0},
+                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0},
+                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0},
+                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0},
+                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0},
+                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0},
+                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0},
 
-                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 },
-                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 },
-                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 },
-                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 },
-                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 },
-                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 },
-                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 },
-                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 },
-                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 },
-                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 },
-                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 },
-                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 },
-                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 },
-                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 },
-                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 },
-                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 },
-                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 },
-                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 },
+                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1},
+                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1},
+                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1},
+                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1},
+                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1},
+                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25},
+                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25},
+                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25},
+                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25},
+                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25},
+                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25},
+                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25},
+                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25},
+                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25},
+                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25},
+                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25},
+                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25},
+                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25},
                 { "label":"Backspace", "matrix": [7, 5], "x": 18.25, "y": 1.25, "w": 2 },
 
-                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 },
-                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 },
-                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 },
-                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 },
-                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 },
+                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25},
+                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25},
+                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25},
+                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25},
+                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25},
                 { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 },
-                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 },
-                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 },
-                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 },
-                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 },
-                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 },
-                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 },
-                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 },
-                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 },
-                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 },
-                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 },
-                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 },
-                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 },
+                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25},
+                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25},
+                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25},
+                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25},
+                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25},
+                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25},
+                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25},
+                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25},
+                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25},
+                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25},
+                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25},
+                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25},
 
-                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 },
-                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 },
-                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 },
-                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 },
-                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 },
+                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25},
+                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25},
+                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25},
+                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25},
+                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25},
                 { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 },
-                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 },
-                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 },
-                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 },
-                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 },
-                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 },
-                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 },
-                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 },
-                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 },
-                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 },
-                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 },
-                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 },
-                { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25, "w": 1 },
+                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25},
+                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25},
+                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25},
+                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25},
+                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25},
+                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25},
+                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25},
+                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25},
+                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25},
+                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25},
+                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25},
+                { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25},
                 { "label":"Enter", "matrix": [9, 4], "x": 19, "y": 2.25, "w": 1.25, "h": 2 },
 
-                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 },
-                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 },
-                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 },
-                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 },
-                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 },
+                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25},
+                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25},
+                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25},
+                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25},
+                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25},
                 { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 1.25},
-                { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25, "w": 1 },
-                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 },
-                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 },
-                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 },
-                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 },
-                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 },
-                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 },
-                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 },
-                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 },
-                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 },
-                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 },
+                { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25},
+                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25},
+                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25},
+                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25},
+                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25},
+                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25},
+                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25},
+                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25},
+                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25},
+                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25},
+                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25},
                 { "label":"Shift", "matrix": [8, 5], "x": 17.5, "y": 4.25, "w": 2.75 },
 
-                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 },
-                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 },
-                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 },
-                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 },
-                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 },
-                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 },
-                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 },
-                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 },
-                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 },
+                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25},
+                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25},
+                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25},
+                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25},
+                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25},
+                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25},
+                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25},
+                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25},
+                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25},
                 { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 },
-                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 },
-                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 },
-                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 },
-                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 },
-                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 }
+                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25},
+                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25},
+                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25},
+                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25},
+                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25}
             ]
         },
         "LAYOUT_iso_split_bs_rshift": {
             "layout": [
-                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0, "w": 1 },
+                { "label":"Middle Click", "matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0, "w": 1 },
-                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0, "w": 1 },
-                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0, "w": 1 },
-                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0, "w": 1 },
-                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0, "w": 1 },
-                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0, "w": 1 },
-                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0, "w": 1 },
-                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0, "w": 1 },
-                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0, "w": 1 },
-                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0, "w": 1 },
-                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0, "w": 1 },
-                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0, "w": 1 },
-                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0, "w": 1 },
-                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0, "w": 1 },
-                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0, "w": 1 },
-                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0, "w": 1 },
-                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0, "w": 1 },
-                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0, "w": 1 },
-                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0, "w": 1 },
+                { "label":"F16", "matrix": [0, 1], "x": 1, "y": 0},
+                { "label":"F17", "matrix": [0, 2], "x": 2, "y": 0},
+                { "label":"F18", "matrix": [0, 3], "x": 3, "y": 0},
+                { "label":"F19", "matrix": [0, 4], "x": 4, "y": 0},
+                { "label":"F1", "matrix": [0, 5], "x": 5.25, "y": 0},
+                { "label":"F2", "matrix": [0, 6], "x": 6.25, "y": 0},
+                { "label":"F3", "matrix": [0, 7], "x": 7.25, "y": 0},
+                { "label":"F4", "matrix": [0, 8], "x": 8.25, "y": 0},
+                { "label":"F5", "matrix": [0, 9], "x": 9.25, "y": 0},
+                { "label":"F6", "matrix": [0, 10], "x": 10.25, "y": 0},
+                { "label":"F7", "matrix": [5, 6], "x": 11.25, "y": 0},
+                { "label":"F8", "matrix": [5, 7], "x": 12.25, "y": 0},
+                { "label":"F9", "matrix": [5, 8], "x": 13.25, "y": 0},
+                { "label":"F10", "matrix": [5, 9], "x": 14.25, "y": 0},
+                { "label":"F11", "matrix": [5, 10], "x": 15.25, "y": 0},
+                { "label":"F12", "matrix": [7, 1], "x": 16.25, "y": 0},
+                { "label":"F13", "matrix": [7, 2], "x": 17.25, "y": 0},
+                { "label":"F14", "matrix": [7, 3], "x": 18.25, "y": 0},
+                { "label":"F15", "matrix": [7, 4], "x": 19.25, "y": 0},
 
-                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1, "w": 1 },
-                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1, "w": 1 },
-                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1, "w": 1 },
-                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1, "w": 1 },
-                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1, "w": 1 },
-                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25, "w": 1 },
-                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25, "w": 1 },
-                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25, "w": 1 },
-                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25, "w": 1 },
-                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25, "w": 1 },
-                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25, "w": 1 },
-                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25, "w": 1 },
-                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25, "w": 1 },
-                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25, "w": 1 },
-                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25, "w": 1 },
-                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25, "w": 1 },
-                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25, "w": 1 },
-                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25, "w": 1 },
-                { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25, "w": 1 },
-                { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25, "w": 1 },
+                { "label":"F20", "matrix": [1, 1], "x": 0, "y": 1},
+                { "label":"F21", "matrix": [1, 2], "x": 1, "y": 1},
+                { "label":"F22", "matrix": [1, 3], "x": 2, "y": 1},
+                { "label":"F23", "matrix": [1, 4], "x": 3, "y": 1},
+                { "label":"F24", "matrix": [1, 5], "x": 4, "y": 1},
+                { "label":"Esc", "matrix": [1, 6], "x": 5.25, "y": 1.25},
+                { "label":"1", "matrix": [1, 7], "x": 6.25, "y": 1.25},
+                { "label":"2", "matrix": [1, 8], "x": 7.25, "y": 1.25},
+                { "label":"3", "matrix": [1, 9], "x": 8.25, "y": 1.25},
+                { "label":"4", "matrix": [1, 10], "x": 9.25, "y": 1.25},
+                { "label":"5", "matrix": [6, 6], "x": 10.25, "y": 1.25},
+                { "label":"6", "matrix": [6, 7], "x": 11.25, "y": 1.25},
+                { "label":"7", "matrix": [6, 8], "x": 12.25, "y": 1.25},
+                { "label":"8", "matrix": [6, 9], "x": 13.25, "y": 1.25},
+                { "label":"9", "matrix": [6, 10], "x": 14.25, "y": 1.25},
+                { "label":"0", "matrix": [8, 1], "x": 15.25, "y": 1.25},
+                { "label":"-", "matrix": [8, 2], "x": 16.25, "y": 1.25},
+                { "label":"=", "matrix": [8, 3], "x": 17.25, "y": 1.25},
+                { "label":"Delete", "matrix": [8, 4], "x": 18.25, "y": 1.25},
+                { "label":"Backspace", "matrix": [7, 5], "x": 19.25, "y": 1.25},
 
-                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25, "w": 1 },
-                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25, "w": 1 },
-                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25, "w": 1 },
-                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25, "w": 1 },
-                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25, "w": 1 },
+                { "label":"/", "matrix": [2, 1], "x": 0, "y": 2.25},
+                { "label":"7", "matrix": [2, 2], "x": 1, "y": 2.25},
+                { "label":"8", "matrix": [2, 3], "x": 2, "y": 2.25},
+                { "label":"9", "matrix": [2, 4], "x": 3, "y": 2.25},
+                { "label":"Home", "matrix": [2, 5], "x": 4, "y": 2.25},
                 { "label":"Tab", "matrix": [2, 6], "x": 5.25, "y": 2.25, "w": 1.5 },
-                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25, "w": 1 },
-                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25, "w": 1 },
-                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25, "w": 1 },
-                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25, "w": 1 },
-                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25, "w": 1 },
-                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25, "w": 1 },
-                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25, "w": 1 },
-                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25, "w": 1 },
-                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25, "w": 1 },
-                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25, "w": 1 },
-                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25, "w": 1 },
-                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25, "w": 1 },
+                { "label":"Q", "matrix": [2, 7], "x": 6.75, "y": 2.25},
+                { "label":"W", "matrix": [2, 8], "x": 7.75, "y": 2.25},
+                { "label":"E", "matrix": [2, 9], "x": 8.75, "y": 2.25},
+                { "label":"R", "matrix": [2, 10], "x": 9.75, "y": 2.25},
+                { "label":"T", "matrix": [7, 6], "x": 10.75, "y": 2.25},
+                { "label":"Y", "matrix": [7, 7], "x": 11.75, "y": 2.25},
+                { "label":"U", "matrix": [7, 8], "x": 12.75, "y": 2.25},
+                { "label":"I", "matrix": [7, 9], "x": 13.75, "y": 2.25},
+                { "label":"O", "matrix": [7, 10], "x": 14.75, "y": 2.25},
+                { "label":"P", "matrix": [9, 1], "x": 15.75, "y": 2.25},
+                { "label":"[", "matrix": [9, 2], "x": 16.75, "y": 2.25},
+                { "label":"]", "matrix": [9, 3], "x": 17.75, "y": 2.25},
 
-                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25, "w": 1 },
-                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25, "w": 1 },
-                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25, "w": 1 },
-                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25, "w": 1 },
-                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25, "w": 1 },
+                { "label":"*", "matrix": [3, 1], "x": 0, "y": 3.25},
+                { "label":"4", "matrix": [3, 2], "x": 1, "y": 3.25},
+                { "label":"5", "matrix": [3, 3], "x": 2, "y": 3.25},
+                { "label":"6", "matrix": [3, 4], "x": 3, "y": 3.25},
+                { "label":"End", "matrix": [3, 5], "x": 4, "y": 3.25},
                 { "label":"Alt", "matrix": [3, 6], "x": 5.25, "y": 3.25, "w": 1.75 },
-                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25, "w": 1 },
-                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25, "w": 1 },
-                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25, "w": 1 },
-                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25, "w": 1 },
-                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25, "w": 1 },
-                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25, "w": 1 },
-                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25, "w": 1 },
-                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25, "w": 1 },
-                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25, "w": 1 },
-                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25, "w": 1 },
-                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25, "w": 1 },
-                { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25, "w": 1 },
+                { "label":"A", "matrix": [3, 7], "x": 7, "y": 3.25},
+                { "label":"S", "matrix": [3, 8], "x": 8, "y": 3.25},
+                { "label":"D", "matrix": [3, 9], "x": 9, "y": 3.25},
+                { "label":"F", "matrix": [3, 10], "x": 10, "y": 3.25},
+                { "label":"G", "matrix": [8, 6], "x": 11, "y": 3.25},
+                { "label":"H", "matrix": [8, 7], "x": 12, "y": 3.25},
+                { "label":"J", "matrix": [8, 8], "x": 13, "y": 3.25},
+                { "label":"K", "matrix": [8, 9], "x": 14, "y": 3.25},
+                { "label":"L", "matrix": [8, 10], "x": 15, "y": 3.25},
+                { "label":";", "matrix": [10, 1], "x": 16, "y": 3.25},
+                { "label":"'", "matrix": [10, 2], "x": 17, "y": 3.25},
+                { "label":"\\", "matrix": [10, 3], "x": 18, "y": 3.25},
                 { "label":"Enter", "matrix": [9, 4], "x": 19, "y": 2.25, "w": 1.25, "h": 2 },
 
-                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25, "w": 1 },
-                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25, "w": 1 },
-                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25, "w": 1 },
-                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25, "w": 1 },
-                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25, "w": 1 },
+                { "label":"-", "matrix": [4, 1], "x": 0, "y": 4.25},
+                { "label":"1", "matrix": [4, 2], "x": 1, "y": 4.25},
+                { "label":"2", "matrix": [4, 3], "x": 2, "y": 4.25},
+                { "label":"3", "matrix": [4, 4], "x": 3, "y": 4.25},
+                { "label":"Page Up", "matrix": [4, 5], "x": 4, "y": 4.25},
                 { "label":"Shift", "matrix": [4, 6], "x": 5.25, "y": 4.25, "w": 1.25},
-                { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25, "w": 1 },
-                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25, "w": 1 },
-                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25, "w": 1 },
-                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25, "w": 1 },
-                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25, "w": 1 },
-                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25, "w": 1 },
-                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25, "w": 1 },
-                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25, "w": 1 },
-                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25, "w": 1 },
-                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25, "w": 1 },
-                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25, "w": 1 },
-                { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25, "w": 1 },
+                { "label":"\\", "matrix": [4, 7], "x": 6.5, "y": 4.25},
+                { "label":"Z", "matrix": [4, 8], "x": 7.5, "y": 4.25},
+                { "label":"X", "matrix": [4, 9], "x": 8.5, "y": 4.25},
+                { "label":"C", "matrix": [4, 10], "x": 9.5, "y": 4.25},
+                { "label":"V", "matrix": [9, 6], "x": 10.5, "y": 4.25},
+                { "label":"B", "matrix": [9, 7], "x": 11.5, "y": 4.25},
+                { "label":"N", "matrix": [9, 8], "x": 12.5, "y": 4.25},
+                { "label":"M", "matrix": [9, 9], "x": 13.5, "y": 4.25},
+                { "label":",", "matrix": [9, 10], "x": 14.5, "y": 4.25},
+                { "label":".", "matrix": [10, 4], "x": 15.5, "y": 4.25},
+                { "label":"/", "matrix": [10, 5], "x": 16.5, "y": 4.25},
+                { "label":"`", "matrix": [9, 5], "x": 17.5, "y": 4.25},
                 { "label":"Shift", "matrix": [8, 5], "x": 18.5, "y": 4.25, "w": 1.75 },
 
-                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25, "w": 1 },
-                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25, "w": 1 },
-                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25, "w": 1 },
-                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25, "w": 1 },
-                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25, "w": 1 },
-                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25, "w": 1 },
-                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25, "w": 1 },
-                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25, "w": 1 },
-                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25, "w": 1 },
+                { "label":"+", "matrix": [5, 1], "x": 0, "y": 5.25},
+                { "label":"0", "matrix": [5, 2], "x": 1, "y": 5.25},
+                { "label":".", "matrix": [5, 3], "x": 2, "y": 5.25},
+                { "label":"Enter", "matrix": [5, 4], "x": 3, "y": 5.25},
+                { "label":"Page Down", "matrix": [5, 5], "x": 4, "y": 5.25},
+                { "label":"Win", "matrix": [6, 1], "x": 5.25, "y": 5.25},
+                { "label":"Ctrl", "matrix": [6, 2], "x": 6.25, "y": 5.25},
+                { "label":"Print", "matrix": [6, 3], "x": 7.25, "y": 5.25},
+                { "label":"Muhenkan", "matrix": [6, 4], "x": 8.25, "y": 5.25},
                 { "label":"Space", "matrix": [6, 5], "x": 9.25, "y": 5.25, "w": 6 },
-                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25, "w": 1 },
-                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25, "w": 1 },
-                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25, "w": 1 },
-                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25, "w": 1 },
-                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25, "w": 1 }
+                { "label":"Henkan", "matrix": [10, 6], "x": 15.25, "y": 5.25},
+                { "label":"Left", "matrix": [10, 7], "x": 16.25, "y": 5.25},
+                { "label":"Up", "matrix": [10, 8], "x": 17.25, "y": 5.25},
+                { "label":"Down", "matrix": [10, 9], "x": 18.25, "y": 5.25},
+                { "label":"Right", "matrix": [10, 10], "x": 19.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json
index 41efd586760..bfb3f8a8a6c 100644
--- a/keyboards/viktus/minne/info.json
+++ b/keyboards/viktus/minne/info.json
@@ -45,276 +45,276 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+                {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
                 {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
                 {"label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3},
+                {"label": "K73", "matrix": [7, 3], "x": 5.875, "y": 3},
                 {"label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3},
                 {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+                {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_dual175u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+                {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
                 {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
                 {"label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3},
                 {"label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3},
                 {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+                {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_275_225u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
                 {"label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3},
                 {"label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3},
                 {"label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3},
                 {"label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_dual3u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+                {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
                 {"label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3},
                 {"label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+                {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_6u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+                {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
                 {"label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+                {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_7u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
                 {"label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3},
                 {"label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3},
                 {"label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3}
@@ -322,42 +322,42 @@
         },
         "LAYOUT_10u": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+                {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+                {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+                {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+                {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+                {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
                 {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+                {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+                {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+                {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+                {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+                {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+                {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
                 {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
+                {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+                {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+                {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+                {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+                {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+                {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+                {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+                {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
                 {"label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3}
             ]
         }
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
index 4f795e082ff..7928430015d 100644
--- a/keyboards/viktus/minne_topre/info.json
+++ b/keyboards/viktus/minne_topre/info.json
@@ -32,180 +32,180 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
                 {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
                 {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
                 {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_dual_3u": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
                 {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
                 {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
                 {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_6u": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
                 {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
-                {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
                 {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
-                {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
-                {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
+                {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+                {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
             ]
         },
         "LAYOUT_7u": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
                 {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
                 {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
                 {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
@@ -213,42 +213,42 @@
         },
         "LAYOUT_10u": {
             "layout": [
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
                 {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
                 {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
-                {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
-                {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
-                {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
-                {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
-                {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
+                {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
                 {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
                 {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
-                {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
-                {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
-                {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
-                {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
-                {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
-                {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
+                {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
                 {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
             ]
         }
diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json
index b528bac281f..34c20891810 100644
--- a/keyboards/viktus/osav2/info.json
+++ b/keyboards/viktus/osav2/info.json
@@ -57,68 +57,68 @@
     "layouts": {
         "LAYOUT_split_normal": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
-                {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
-                {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+                {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+                {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
                 {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
+                {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
                 {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
@@ -126,69 +126,69 @@
         },
         "LAYOUT_split_normal_split": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
-                {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
-                {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+                {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+                {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
-                {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
+                {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
                 {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
+                {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
                 {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
@@ -196,68 +196,68 @@
         },
         "LAYOUT_split_mirrored_split": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
-                {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
-                {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+                {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+                {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
-                {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
+                {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4},
+                {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4},
                 {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
@@ -266,67 +266,67 @@
         },
         "LAYOUT_2u_normal": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
                 {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
                 {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
+                {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
                 {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
@@ -334,68 +334,68 @@
         },
         "LAYOUT_2u_normal_split": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
                 {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
-                {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
+                {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
                 {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
-                {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
+                {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
                 {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
@@ -403,67 +403,67 @@
         },
         "LAYOUT_2u_mirrored_split": {
             "layout": [
-                {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
-                {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
-                {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
-                {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
-                {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
-                {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
-                {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
-                {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
-                {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
-                {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
-                {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
-                {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
-                {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
-                {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
+                {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+                {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+                {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+                {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+                {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+                {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+                {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+                {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+                {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+                {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+                {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+                {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+                {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+                {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
                 {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
-                {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
+                {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
                 {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
-                {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
-                {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
-                {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
-                {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
-                {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
-                {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
-                {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
-                {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
-                {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
-                {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
-                {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
-                {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
+                {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+                {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+                {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+                {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+                {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+                {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+                {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+                {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+                {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+                {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+                {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+                {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
                 {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
-                {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
                 {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
-                {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
-                {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
-                {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
-                {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
-                {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
-                {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
-                {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
-                {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
-                {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
-                {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
-                {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
+                {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+                {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+                {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+                {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+                {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+                {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+                {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+                {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+                {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+                {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+                {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
                 {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
                 {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
-                {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
-                {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
-                {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
-                {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
-                {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
-                {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
-                {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
-                {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
-                {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
-                {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
-                {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
+                {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+                {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+                {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+                {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+                {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+                {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
                 {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
-                {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
+                {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
                 {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
                 {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
-                {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4},
+                {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4},
                 {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
                 {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
                 {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json
index 76bed29efb5..db0c1085428 100644
--- a/keyboards/ymdk/id75/info.json
+++ b/keyboards/ymdk/id75/info.json
@@ -170,81 +170,81 @@
     "layouts": {
         "LAYOUT_ortho_5x15": {
             "layout": [
-                {"label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
-                {"label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
-                {"label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
-                {"label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
-                {"label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
-                {"label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
-                {"label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
-                {"label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
-                {"label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
-                {"label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
-                {"label": "k0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
-                {"label": "k0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0},
-                {"label": "k0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0},
-                {"label": "k0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0},
-                {"label": "k0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0},
-                {"label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1},
-                {"label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1},
-                {"label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1},
-                {"label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1},
-                {"label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1},
-                {"label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1},
-                {"label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1},
-                {"label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1},
-                {"label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1},
-                {"label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1},
-                {"label": "k1A", "matrix": [1, 10], "w": 1, "x": 10, "y": 1},
-                {"label": "k1B", "matrix": [1, 11], "w": 1, "x": 11, "y": 1},
-                {"label": "k1C", "matrix": [1, 12], "w": 1, "x": 12, "y": 1},
-                {"label": "k1D", "matrix": [1, 13], "w": 1, "x": 13, "y": 1},
-                {"label": "k1E", "matrix": [1, 14], "w": 1, "x": 14, "y": 1},
-                {"label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2},
-                {"label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2},
-                {"label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2},
-                {"label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2},
-                {"label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2},
-                {"label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2},
-                {"label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2},
-                {"label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2},
-                {"label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2},
-                {"label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2},
-                {"label": "k2A", "matrix": [2, 10], "w": 1, "x": 10, "y": 2},
-                {"label": "k2B", "matrix": [2, 11], "w": 1, "x": 11, "y": 2},
-                {"label": "k2C", "matrix": [2, 12], "w": 1, "x": 12, "y": 2},
-                {"label": "k2D", "matrix": [2, 13], "w": 1, "x": 13, "y": 2},
-                {"label": "k2E", "matrix": [2, 14], "w": 1, "x": 14, "y": 2},
-                {"label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3},
-                {"label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3},
-                {"label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3},
-                {"label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3},
-                {"label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3},
-                {"label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3},
-                {"label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3},
-                {"label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3},
-                {"label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3},
-                {"label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3},
-                {"label": "k3A", "matrix": [3, 10], "w": 1, "x": 10, "y": 3},
-                {"label": "k3B", "matrix": [3, 11], "w": 1, "x": 11, "y": 3},
-                {"label": "k3C", "matrix": [3, 12], "w": 1, "x": 12, "y": 3},
-                {"label": "k3D", "matrix": [3, 13], "w": 1, "x": 13, "y": 3},
-                {"label": "k3E", "matrix": [3, 14], "w": 1, "x": 14, "y": 3},
-                {"label": "k40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4},
-                {"label": "k41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4},
-                {"label": "k42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4},
-                {"label": "k43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4},
-                {"label": "k44", "matrix": [4, 4], "w": 1, "x": 4, "y": 4},
-                {"label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 4},
-                {"label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 4},
-                {"label": "k47", "matrix": [4, 7], "w": 1, "x": 7, "y": 4},
-                {"label": "k48", "matrix": [4, 8], "w": 1, "x": 8, "y": 4},
-                {"label": "k49", "matrix": [4, 9], "w": 1, "x": 9, "y": 4},
-                {"label": "k4A", "matrix": [4, 10], "w": 1, "x": 10, "y": 4},
-                {"label": "k4B", "matrix": [4, 11], "w": 1, "x": 11, "y": 4},
-                {"label": "k4C", "matrix": [4, 12], "w": 1, "x": 12, "y": 4},
-                {"label": "k4D", "matrix": [4, 13], "w": 1, "x": 13, "y": 4},
-                {"label": "k4E", "matrix": [4, 14], "w": 1, "x": 14, "y": 4}
+                {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0},
+                {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1},
+                {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1},
+                {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1},
+                {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1},
+                {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2},
+                {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2},
+                {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2},
+                {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2},
+                {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2},
+                {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2},
+                {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2},
+                {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2},
+                {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2},
+                {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3},
+                {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3},
+                {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3},
+                {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3},
+                {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3},
+                {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3},
+                {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3},
+                {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3},
+                {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4},
+                {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4},
+                {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4},
+                {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+                {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4},
+                {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4},
+                {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4},
+                {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4},
+                {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4},
+                {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4},
+                {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4},
+                {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4}
             ]
         }
     }