Merge branch 'develop'

2 files changed, 269 insertions, 270 deletions

diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index b28edb717a..d8216891cd 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -18,72 +18,72 @@
     "rgb_matrix": {
         "driver": "IS31FL3737",
         "layout": [
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 },
-            { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 },
-            { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 },
-            { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 },
-            { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 },
-            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 },
-            { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 },
-            { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 },
-            { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 },
-            { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 },
-            { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 },
-            { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 },
-            { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 },
-            { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 },
-            { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 },
-            { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 },
-            { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 },
-            { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 },
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 },
-            { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 },
-            { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 },
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 },
-            { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 },
-            { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
-            { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 },
-            { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 },
-            { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 },
-            { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 },
-            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 },
-            { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 },
-            { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 },
-            { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 },
-            { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 },
-            { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 },
-            { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 },
-            { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 },
-            { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 },
-            { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 },
-            { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 },
-            { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 },
-            { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 },
-            { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 },
-            { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 },
-            { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 },
-            { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 },
-            { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 },
-            { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 },
-            { "flags": 1, "matrix": [4, 8], "x": 151, "y": 64 },
-            { "flags": 1, "matrix": [4, 10], "x": 170, "y": 64 },
-            { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 },
-            { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 },
-            { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 }
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0},
+            {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0},
+            {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
+            {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
+            {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
+            {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
+            {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
+            {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
+            {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16},
+            {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16},
+            {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16},
+            {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16},
+            {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16},
+            {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
+            {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
+            {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32},
+            {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32},
+            {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32},
+            {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32},
+            {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32},
+            {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32},
+            {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48},
+            {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48},
+            {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48},
+            {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48},
+            {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48},
+            {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48},
+            {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48},
+            {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48},
+            {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48},
+            {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48},
+            {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48},
+            {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48},
+            {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48},
+            {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
+            {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
+            {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
+            {"flags": 1, "matrix": [4, 8], "x": 151, "y": 64},
+            {"flags": 1, "matrix": [4, 10], "x": 170, "y": 64},
+            {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
+            {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
+            {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
         ]
     },
     "usb": {
@@ -94,72 +94,72 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-                { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
-                { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 },
-                { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
-                { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
-                { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "w": 1.25, "x": 10, "y": 4},
+                {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/dztech/tofu/jr/v1/info.json b/keyboards/dztech/tofu/jr/v1/info.json
index a786b8689d..ef9bc6b903 100644
--- a/keyboards/dztech/tofu/jr/v1/info.json
+++ b/keyboards/dztech/tofu/jr/v1/info.json
@@ -9,7 +9,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
+        "rgb_matrix": true
     },
     "matrix_pins": {
         "cols": ["GP25", "GP24", "GP23", "GP1", "GP7", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP15", "GP14", "GP13", "GP12"],
@@ -18,74 +18,74 @@
     "rgb_matrix": {
         "driver": "IS31FL3737",
         "layout": [
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 },
-            { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 },
-            { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 },
-            { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 },
-            { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 },
-            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 },
-            { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 },
-            { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 },
-            { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 },
-            { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 },
-            { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 },
-            { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 },
-            { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 },
-            { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 },
-            { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 },
-            { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 },
-            { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 },
-            { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 },
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 },
-            { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 },
-            { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 },
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 },
-            { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 },
-            { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
-            { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 },
-            { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 },
-            { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 },
-            { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 },
-            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 },
-            { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 },
-            { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 },
-            { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 },
-            { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 },
-            { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 },
-            { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 },
-            { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 },
-            { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 },
-            { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 },
-            { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 },
-            { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 },
-            { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 },
-            { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 },
-            { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 },
-            { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 },
-            { "flags": 1, "matrix": [3, 14], "x": 224, "y": 48 },
-            { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 },
-            { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 },
-            { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 },
-            { "flags": 1, "matrix": [4, 8], "x": 150, "y": 64 },
-            { "flags": 1, "matrix": [4, 9], "x": 165, "y": 64 },
-            { "flags": 1, "matrix": [4, 10], "x": 180, "y": 64 },
-            { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 },
-            { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 },
-            { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 }
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0},
+            {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0},
+            {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
+            {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
+            {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
+            {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
+            {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
+            {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
+            {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16},
+            {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16},
+            {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16},
+            {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16},
+            {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16},
+            {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
+            {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
+            {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32},
+            {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32},
+            {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32},
+            {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32},
+            {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32},
+            {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32},
+            {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48},
+            {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48},
+            {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48},
+            {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48},
+            {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48},
+            {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48},
+            {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48},
+            {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48},
+            {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48},
+            {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48},
+            {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48},
+            {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48},
+            {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48},
+            {"flags": 1, "matrix": [3, 14], "x": 224, "y": 48},
+            {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
+            {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
+            {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
+            {"flags": 1, "matrix": [4, 8], "x": 150, "y": 64},
+            {"flags": 1, "matrix": [4, 9], "x": 165, "y": 64},
+            {"flags": 1, "matrix": [4, 10], "x": 180, "y": 64},
+            {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
+            {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
+            {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
         ]
     },
     "usb": {
@@ -97,76 +97,75 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                { "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
-                { "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
-                { "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
-                { "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
-                { "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
-                { "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
-                { "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
-                { "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
-                { "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
-                { "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
-                { "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
-                { "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
-                { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "w": 1, "x": 15, "y": 0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "w": 1, "x": 15, "y": 1 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "w": 1, "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
-                { "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
-                { "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
-                { "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
-                { "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
-                { "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
-                { "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
-                { "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
-                { "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
-                { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
-                { "matrix": [3, 14], "w": 1, "x": 15, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 8], "w": 1, "x": 10, "y": 4 },
-                { "matrix": [4, 9], "w": 1, "x": 11, "y": 4 },
-                { "matrix": [4, 10], "w": 1, "x": 12, "y": 4 },
-                { "matrix": [4, 12], "w": 1, "x": 13, "y": 4 },
-                { "matrix": [4, 13], "w": 1, "x": 14, "y": 4 },
-                { "matrix": [4, 14], "w": 1, "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4},
+                {"matrix": [4, 9], "x": 11, "y": 4},
+                {"matrix": [4, 10], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
 }
-