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

16 files changed, 623 insertions, 1199 deletions

diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
index 20ccb509e6..af75560e84 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/info.json
@@ -31,17 +31,17 @@
   "layouts": {
     "LAYOUT_split_1x5": {
       "layout": [
-        {"matrix": [0, 0], "x":0, "y":0.25},
-        {"matrix": [0, 1], "x":1, "y":0.125},
-        {"matrix": [0, 2], "x":2, "y":0},
-        {"matrix": [0, 3], "x":3, "y":0.5},
-        {"matrix": [0, 4], "x":3.75, "y":2.75},
+        {"matrix": [0, 0], "x": 0, "y": 0.25},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.5},
+        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
 
-        {"matrix": [1, 0], "x":5.75, "y":2.75},
-        {"matrix": [1, 1], "x":6.5, "y":0.5},
-        {"matrix": [1, 2], "x":7.5, "y":0},
-        {"matrix": [1, 3], "x":8.5, "y":0.125},
-        {"matrix": [1, 4], "x":9.5, "y":0.25}
+        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+        {"matrix": [1, 2], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
       ]
     }
   }
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
index a90a831f8a..173abdfb60 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/info.json
@@ -18,7 +18,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index be2a1ee8fd..8d59a107f7 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -29,8 +29,8 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"x":0, "y":0.375},
-            {"x":16.5, "y":0.38}
+            {"x": 0, "y": 0.375},
+            {"x": 16.5, "y": 0.38}
         ]
     },
     "ws2812": {
@@ -38,96 +38,96 @@
         "driver": "vendor"
     },
     "layouts": {
-        "LAYOUT":{
-            "layout":[
-                {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0},
-                {"matrix":[0, 3], "x":3.5, "y":0.125},
-                {"matrix":[0, 4], "x":4.5, "y":0.125},
-                {"matrix":[0, 5], "x":5.5, "y":0.125},
-                {"matrix":[0, 6], "x":6.5, "y":0.125},
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.125},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.125},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.125},
 
-                {"matrix":[6, 6], "x":10.5, "y":0.125},
-                {"matrix":[6, 5], "x":11.5, "y":0.125},
-                {"matrix":[6, 4], "x":12.5, "y":0.125},
-                {"matrix":[6, 3], "x":13.5, "y":0.125},
-                {"matrix":[6, 2], "x":14.5, "y":0},
-                {"matrix":[6, 1], "x":15.5, "y":0.25},
-                {"matrix":[6, 0], "x":16.5, "y":0.25, "w":1.5},
+                {"matrix": [6, 6], "x": 10.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 4], "x": 12.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 2], "x": 14.5, "y": 0},
+                {"matrix": [6, 1], "x": 15.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 16.5, "y": 0.25, "w": 1.5},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1.125},
-                {"matrix":[1, 4], "x":4.5, "y":1.125},
-                {"matrix":[1, 5], "x":5.5, "y":1.125},
-                {"matrix":[1, 6], "x":6.5, "y":1.125},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.125},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.125},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.125},
 
-                {"matrix":[7, 6], "x":10.5, "y":1.125},
-                {"matrix":[7, 5], "x":11.5, "y":1.125},
-                {"matrix":[7, 4], "x":12.5, "y":1.125},
-                {"matrix":[7, 3], "x":13.5, "y":1.125},
-                {"matrix":[7, 2], "x":14.5, "y":1},
-                {"matrix":[7, 1], "x":15.5, "y":1.25},
-                {"matrix":[7, 0], "x":16.5, "y":1.25, "w":1.5},
+                {"matrix": [7, 6], "x": 10.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 4], "x": 12.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 2], "x": 14.5, "y": 1},
+                {"matrix": [7, 1], "x": 15.5, "y": 1.25},
+                {"matrix": [7, 0], "x": 16.5, "y": 1.25, "w": 1.5},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2.125},
-                {"matrix":[2, 4], "x":4.5, "y":2.125},
-                {"matrix":[2, 5], "x":5.5, "y":2.125},
-                {"matrix":[2, 6], "x":6.5, "y":2.125},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.125},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.125},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.125},
 
-                {"matrix":[8, 6], "x":10.5, "y":2.125},
-                {"matrix":[8, 5], "x":11.5, "y":2.125},
-                {"matrix":[8, 4], "x":12.5, "y":2.125},
-                {"matrix":[8, 3], "x":13.5, "y":2.125},
-                {"matrix":[8, 2], "x":14.5, "y":2},
-                {"matrix":[8, 1], "x":15.5, "y":2.25},
-                {"matrix":[8, 0], "x":16.5, "y":2.25, "w":1.5},
+                {"matrix": [8, 6], "x": 10.5, "y": 2.125},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 14.5, "y": 2},
+                {"matrix": [8, 1], "x": 15.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 16.5, "y": 2.25, "w": 1.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.5},
-                {"matrix":[3, 1], "x":1.5, "y":3.25},
-                {"matrix":[3, 2], "x":2.5, "y":3},
-                {"matrix":[3, 3], "x":3.5, "y":3.125},
-                {"matrix":[3, 4], "x":4.5, "y":3.125},
-                {"matrix":[3, 5], "x":5.5, "y":3.125},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.125},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.125},
 
-                {"matrix":[9, 5], "x":11.5, "y":3.125},
-                {"matrix":[9, 4], "x":12.5, "y":3.125},
-                {"matrix":[9, 3], "x":13.5, "y":3.125},
-                {"matrix":[9, 2], "x":14.5, "y":3},
-                {"matrix":[9, 1], "x":15.5, "y":3.25},
-                {"matrix":[9, 0], "x":16.5, "y":3.25, "w":1.5},
+                {"matrix": [9, 5], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 4], "x": 12.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 2], "x": 14.5, "y": 3},
+                {"matrix": [9, 1], "x": 15.5, "y": 3.25},
+                {"matrix": [9, 0], "x": 16.5, "y": 3.25, "w": 1.5},
 
-                {"matrix":[4, 0], "x":0.5, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25},
-                {"matrix":[4, 2], "x":2.5, "y":4},
-                {"matrix":[4, 3], "x":3.5, "y":4.125},
+                {"matrix": [4, 0], "x": 0.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.125},
 
-                {"matrix":[10, 3], "x":13.5, "y":4.125},
-                {"matrix":[10, 2], "x":14.5, "y":4},
-                {"matrix":[10, 1], "x":15.5, "y":4.25},
-                {"matrix":[10, 0], "x":16.5, "y":4.25},
+                {"matrix": [10, 3], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 2], "x": 14.5, "y": 4},
+                {"matrix": [10, 1], "x": 15.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 16.5, "y": 4.25},
 
-                {"matrix":[4, 4], "x":5, "y":4.375, "h":2},
-                {"matrix":[4, 5], "x":6.25, "y":4.375, "h":1.5},
-                {"matrix":[10, 5], "x":10.75, "y":4.375, "h":1.5},
-                {"matrix":[10, 4], "x":12, "y":4.375, "h":2},
+                {"matrix": [4, 4], "x": 5, "y": 4.375, "h": 2},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 5], "x": 10.75, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 4], "x": 12, "y": 4.375, "h": 2},
 
-                {"matrix":[5, 4], "x":6.25, "y":6.125},
-                {"matrix":[5, 5], "x":7.5, "y":6.125},
+                {"matrix": [5, 4], "x": 6.25, "y": 6.125},
+                {"matrix": [5, 5], "x": 7.5, "y": 6.125},
 
-                {"matrix":[11, 5], "x":9.5, "y":6.125},
-                {"matrix":[11, 4], "x":10.75, "y":6.125},
+                {"matrix": [11, 5], "x": 9.5, "y": 6.125},
+                {"matrix": [11, 4], "x": 10.75, "y": 6.125},
 
-                {"matrix":[5, 2], "x":6.25, "y":7.125},
-                {"matrix":[5, 3], "x":7.25, "y":7.125},
+                {"matrix": [5, 2], "x": 6.25, "y": 7.125},
+                {"matrix": [5, 3], "x": 7.25, "y": 7.125},
 
-                {"matrix":[11, 3], "x":9.75, "y":7.125},
-                {"matrix":[11, 2], "x":10.75, "y":7.125}
+                {"matrix": [11, 3], "x": 9.75, "y": 7.125},
+                {"matrix": [11, 2], "x": 10.75, "y": 7.125}
             ]
         }
     }
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 3f51e00aa6..ab7747d43a 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -8,30 +8,8 @@
         "term": 175
     },
     "matrix_pins": {
-        "cols": [
-            "B6",
-            "B7",
-            "C6",
-            "C7",
-            "D0",
-            "D1",
-            "D2",
-            "D3",
-            "D4",
-            "D5",
-            "D6",
-            "D7",
-            "E6",
-            "F0"
-        ],
-        "rows": [
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "B4",
-            "B5"
-        ]
+        "cols": ["B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
     },
     "usb": {
         "vid": "0x1209",
@@ -65,633 +43,83 @@
     "layouts": {
         "LAYOUT_abnt2": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 13,
-                    "y": 1.25,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 13.75,
-                    "y": 2.25,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 12.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 1.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 13.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 1.25,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 2.5,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 12.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 13.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        13
-                    ],
-                    "x": 14.25,
-                    "y": 5.25
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index 4e218e1dd8..eb6e57abde 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -24,15 +24,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 778a9a0412..555731bdd5 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -27,12 +27,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/info.json
index 1f56982b6d..6744d4b701 100644
--- a/keyboards/handwired/dactylmacropad/info.json
+++ b/keyboards/handwired/dactylmacropad/info.json
@@ -11,7 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "encoder":true
+        "encoder": true
     },
     "matrix_pins": {
         "cols": ["F7", "B1", "B3", "B2", "B6"],
@@ -31,19 +31,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
index cfe18929d0..8308506512 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -46,111 +46,111 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label":"Esc", "matrix": [5, 16], "x": 0, "y": 0 },
-                { "label":"F1", "matrix": [2, 4], "x": 2, "y": 0 },
-                { "label":"F2", "matrix": [2, 5], "x": 3, "y": 0 },
-                { "label":"F3", "matrix": [3, 5], "x": 4, "y": 0 },
-                { "label":"F4", "matrix": [5, 5], "x": 5, "y": 0 },
-                { "label":"F5", "matrix": [0, 1], "x": 6.5, "y": 0 },
-                { "label":"F6", "matrix": [5, 8], "x": 7.5, "y": 0 },
-                { "label":"F7", "matrix": [3, 3], "x": 8.5, "y": 0 },
-                { "label":"F8", "matrix": [2, 3], "x": 9.5, "y": 0 },
-                { "label":"F9", "matrix": [2, 2], "x": 11, "y": 0 },
-                { "label":"F10", "matrix": [0, 2], "x": 12, "y": 0 },
-                { "label":"F11", "matrix": [5, 2], "x": 13, "y": 0 },
-                { "label":"F12", "matrix": [6, 2], "x": 14, "y": 0 },
-                { "label":"Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0 },
-                { "label":"Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0 },
-                { "label":"Pause", "matrix": [1, 1], "x": 17.25, "y": 0 },
-                { "label":"`", "matrix": [2, 16], "x": 0, "y": 1.25 },
-                { "label":"1", "matrix": [0, 16], "x": 1, "y": 1.25 },
-                { "label":"2", "matrix": [0, 4], "x": 2, "y": 1.25 },
-                { "label":"3", "matrix": [0, 5], "x": 3, "y": 1.25 },
-                { "label":"4", "matrix": [0, 6], "x": 4, "y": 1.25 },
-                { "label":"5", "matrix": [2, 6], "x": 5, "y": 1.25 },
-                { "label":"6", "matrix": [2, 7], "x": 6, "y": 1.25 },
-                { "label":"7", "matrix": [0, 7], "x": 7, "y": 1.25 },
-                { "label":"8", "matrix": [0, 8], "x": 8, "y": 1.25 },
-                { "label":"9", "matrix": [0, 3], "x": 9, "y": 1.25 },
-                { "label":"0", "matrix": [0, 9], "x": 10, "y": 1.25 },
-                { "label":"-", "matrix": [2, 9], "x": 11, "y": 1.25 },
-                { "label":"=", "matrix": [2, 8], "x": 12, "y": 1.25 },
-                { "label":"Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25 },
-                { "label":"Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25 },
-                { "label":"Home", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
-                { "label":"Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25 },
-                { "label":"Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25 },
-                { "label":"/", "matrix": [4, 11], "x": 19.5, "y": 1.25 },
-                { "label":"*", "matrix": [4, 14], "x": 20.5, "y": 1.25 },
-                { "label":"-", "matrix": [6, 14], "x": 21.5, "y": 1.25 },
-                { "label":"Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label":"Q", "matrix": [1, 16], "x": 1.5, "y": 2.25 },
-                { "label":"W", "matrix": [1, 4], "x": 2.5, "y": 2.25 },
-                { "label":"E", "matrix": [1, 5], "x": 3.5, "y": 2.25 },
-                { "label":"R", "matrix": [1, 6], "x": 4.5, "y": 2.25 },
-                { "label":"T", "matrix": [3, 6], "x": 5.5, "y": 2.25 },
-                { "label":"Y", "matrix": [3, 7], "x": 6.5, "y": 2.25 },
-                { "label":"U", "matrix": [1, 7], "x": 7.5, "y": 2.25 },
-                { "label":"I", "matrix": [1, 8], "x": 8.5, "y": 2.25 },
-                { "label":"O", "matrix": [1, 3], "x": 9.5, "y": 2.25 },
-                { "label":"P", "matrix": [1, 9], "x": 10.5, "y": 2.25 },
-                { "label":"[", "matrix": [3, 9], "x": 11.5, "y": 2.25 },
-                { "label":"]", "matrix": [3, 8], "x": 12.5, "y": 2.25 },
-                { "label":"Del", "matrix": [2, 10], "x": 15.25, "y": 2.25 },
-                { "label":"End", "matrix": [0, 15], "x": 16.25, "y": 2.25 },
-                { "label":"Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25 },
-                { "label":"7", "matrix": [1, 10], "x": 18.5, "y": 2.25 },
-                { "label":"8", "matrix": [1, 11], "x": 19.5, "y": 2.25 },
-                { "label":"9", "matrix": [1, 14], "x": 20.5, "y": 2.25 },
-                { "label":"+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25 },
-                { "label":"Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label":"A", "matrix": [7, 16], "x": 1.75, "y": 3.25 },
-                { "label":"S", "matrix": [7, 4], "x": 2.75, "y": 3.25 },
-                { "label":"D", "matrix": [7, 5], "x": 3.75, "y": 3.25 },
-                { "label":"F", "matrix": [7, 6], "x": 4.75, "y": 3.25 },
-                { "label":"G", "matrix": [5, 6], "x": 5.75, "y": 3.25 },
-                { "label":"H", "matrix": [5, 7], "x": 6.75, "y": 3.25 },
-                { "label":"J", "matrix": [7, 7], "x": 7.75, "y": 3.25 },
-                { "label":"K", "matrix": [7, 8], "x": 8.75, "y": 3.25 },
-                { "label":"L", "matrix": [7, 3], "x": 9.75, "y": 3.25 },
-                { "label":";", "matrix": [7, 9], "x": 10.75, "y": 3.25 },
-                { "label":"'", "matrix": [5, 9], "x": 11.75, "y": 3.25 },
-                { "label":"#", "matrix": [1, 2], "x": 12.75, "y": 3.25 },
-                { "label":"Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25 },
-                { "label":"4", "matrix": [3, 10], "x": 18.5, "y": 3.25 },
-                { "label":"5", "matrix": [3, 11], "x": 19.5, "y": 3.25 },
-                { "label":"6", "matrix": [3, 14], "x": 20.5, "y": 3.25 },
-                { "label":"Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25 },
-                { "label":"\\", "matrix": [5, 4], "x": 1.25, "y": 4.25 },
-                { "label":"Z", "matrix": [4, 16], "x": 2.25, "y": 4.25 },
-                { "label":"X", "matrix": [4, 4], "x": 3.25, "y": 4.25 },
-                { "label":"C", "matrix": [4, 5], "x": 4.25, "y": 4.25 },
-                { "label":"V", "matrix": [4, 6], "x": 5.25, "y": 4.25 },
-                { "label":"B", "matrix": [6, 6], "x": 6.25, "y": 4.25 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 4.25 },
-                { "label":"M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label":",", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label":".", "matrix": [4, 3], "x": 10.25, "y": 4.25 },
-                { "label":"/", "matrix": [6, 9], "x": 11.25, "y": 4.25 },
-                { "label":"Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label":"Up", "matrix": [5, 15], "x": 16.25, "y": 4.25 },
-                { "label":"1", "matrix": [7, 10], "x": 18.5, "y": 4.25 },
-                { "label":"2", "matrix": [7, 11], "x": 19.5, "y": 4.25 },
-                { "label":"3", "matrix": [7, 14], "x": 20.5, "y": 4.25 },
-                { "label":"Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25 },
-                { "label":"Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label":"Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label":"Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label":" ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label":"Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label":"Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label":"Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label":"Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label":"Left", "matrix": [6, 15], "x": 15.25, "y": 5.25 },
-                { "label":"Down", "matrix": [6, 10], "x": 16.25, "y": 5.25 },
-                { "label":"Right", "matrix": [6, 11], "x": 17.25, "y": 5.25 },
-                { "label":"0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25 },
-                { "label":"Del", "matrix": [5, 14], "x": 20.5, "y": 5.25 }
+                {"label": "Esc", "matrix": [5, 16], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [2, 4], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [5, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 1], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [5, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [3, 3], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [2, 3], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [2, 2], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [5, 2], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 2], "x": 14, "y": 0},
+                {"label": "Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0},
+                {"label": "Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [1, 1], "x": 17.25, "y": 0},
+                {"label": "`", "matrix": [2, 16], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [0, 16], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [0, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [0, 5], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [0, 6], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [2, 6], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [2, 7], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [0, 3], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [0, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [2, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+                {"label": "Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25},
+                {"label": "Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25},
+                {"label": "/", "matrix": [4, 11], "x": 19.5, "y": 1.25},
+                {"label": "*", "matrix": [4, 14], "x": 20.5, "y": 1.25},
+                {"label": "-", "matrix": [6, 14], "x": 21.5, "y": 1.25},
+                {"label": "Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "Q", "matrix": [1, 16], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [3, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [3, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [1, 3], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [1, 9], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [3, 9], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [3, 8], "x": 12.5, "y": 2.25},
+                {"label": "Del", "matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [0, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25},
+                {"label": "7", "matrix": [1, 10], "x": 18.5, "y": 2.25},
+                {"label": "8", "matrix": [1, 11], "x": 19.5, "y": 2.25},
+                {"label": "9", "matrix": [1, 14], "x": 20.5, "y": 2.25},
+                {"label": "+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "A", "matrix": [7, 16], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [7, 4], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [7, 5], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [7, 6], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [7, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 9], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 9], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [1, 2], "x": 12.75, "y": 3.25},
+                {"label": "Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4", "matrix": [3, 10], "x": 18.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 11], "x": 19.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 14], "x": 20.5, "y": 3.25},
+                {"label": "Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "\\", "matrix": [5, 4], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 16], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 3], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [6, 9], "x": 11.25, "y": 4.25},
+                {"label": "Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "Up", "matrix": [5, 15], "x": 16.25, "y": 4.25},
+                {"label": "1", "matrix": [7, 10], "x": 18.5, "y": 4.25},
+                {"label": "2", "matrix": [7, 11], "x": 19.5, "y": 4.25},
+                {"label": "3", "matrix": [7, 14], "x": 20.5, "y": 4.25},
+                {"label": "Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25},
+                {"label": "Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+                {"label": "Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+                {"label": "Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+                {"label": " ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+                {"label": "Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+                {"label": "Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+                {"label": "Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+                {"label": "Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+                {"label": "Left", "matrix": [6, 15], "x": 15.25, "y": 5.25},
+                {"label": "Down", "matrix": [6, 10], "x": 16.25, "y": 5.25},
+                {"label": "Right", "matrix": [6, 11], "x": 17.25, "y": 5.25},
+                {"label": "0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+                {"label": "Del", "matrix": [5, 14], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
index 6ef96b29d7..991be93b52 100644
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -14,19 +14,7 @@
     },
     "matrix_pins": {
         // TX0, RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1
-        "cols": [
-            "D3",
-            "D2",
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5",
-            "F4",
-            "F5",
-            "F6"
-        ],
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
         // A0, 15, 14, 16, 10
         "rows": ["F7", "B1", "B3", "B2", "B6"]
     },
@@ -44,54 +32,54 @@
         "LAYOUT_ortho_4_3x10_4": {
             "layout": [
                 // Row 1 (Macros)
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
 
                 // Row 2
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-                { "matrix": [1, 10], "x": 10, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
 
                 // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-                { "matrix": [2, 10], "x": 10, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
 
                 // Row 4
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 5], "x": 5, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 },
-                { "matrix": [3, 9], "x": 9, "y": 3 },
-                { "matrix": [3, 10], "x": 10, "y": 3 },
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
 
                 // Row 5
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 5], "x": 5, "y": 4 },
-                { "matrix": [4, 9], "x": 9, "y": 4 },
-                { "matrix": [4, 10], "x": 10, "y": 4 }
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json
index 7b62bfeb7a..057552e621 100644
--- a/keyboards/handwired/maverick0197/keydeck8/info.json
+++ b/keyboards/handwired/maverick0197/keydeck8/info.json
@@ -29,9 +29,17 @@
     "layouts": {
         "LAYOUT": {
         "layout": [
-                {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1},
-                {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2}
+                {"label": "D0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "D4", "matrix": [0, 2], "x": 2, "y": 0},
+
+                {"label": "C6", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D7", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "E6", "matrix": [1, 2], "x": 2, "y": 1},
+
+                {"label": "B4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "B5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "B6", "matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index a72ceb4fc7..eae71d9508 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -27,85 +27,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
-                {"x":1.5, "y":0.75, "matrix": [0, 1]},
-                {"x":2.5, "y":0.25, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "matrix": [0, 3]},
-                {"x":4.5, "y":0.25, "matrix": [0, 4]},
-                {"x":5.5, "y":0.75, "matrix": [0, 5]},
-                {"x":6.5, "y":1, "matrix": [0, 6]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
 
-                {"x":9.5, "y":1, "matrix": [5, 0]},
-                {"x":10.5, "y":0.75, "matrix": [5, 1]},
-                {"x":11.5, "y":0.25, "matrix": [5, 2]},
-                {"x":12.5, "y":0, "matrix": [5, 3]},
-                {"x":13.5, "y":0.25, "matrix": [5, 4]},
-                {"x":14.5, "y":0.75, "matrix": [5, 5]},
-                {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
 
-                {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1.75, "matrix": [1, 1]},
-                {"x":2.5, "y":1.25, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1.25, "matrix": [1, 4]},
-                {"x":5.5, "y":1.75, "matrix": [1, 5]},
-                {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
 
-                {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
-                {"x":10.5, "y":1.75, "matrix": [6, 1]},
-                {"x":11.5, "y":1.25, "matrix": [6, 2]},
-                {"x":12.5, "y":1, "matrix": [6, 3]},
-                {"x":13.5, "y":1.25, "matrix": [6, 4]},
-                {"x":14.5, "y":1.75, "matrix": [6, 5]},
-                {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
 
-                {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.75, "matrix": [2, 1]},
-                {"x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"x":3.5, "y":2, "matrix": [2, 3]},
-                {"x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"x":5.5, "y":2.75, "matrix": [2, 5]},
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
 
-                {"x":10.5, "y":2.75, "matrix": [7, 1]},
-                {"x":11.5, "y":2.25, "matrix": [7, 2]},
-                {"x":12.5, "y":2, "matrix": [7, 3]},
-                {"x":13.5, "y":2.25, "matrix": [7, 4]},
-                {"x":14.5, "y":2.75, "matrix": [7, 5]},
-                {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
-                {"x":1.5, "y":3.75, "matrix": [3, 1]},
-                {"x":2.5, "y":3.25, "matrix": [3, 2]},
-                {"x":3.5, "y":3, "matrix": [3, 3]},
-                {"x":4.5, "y":3.25, "matrix": [3, 4]},
-                {"x":5.5, "y":3.75, "matrix": [3, 5]},
-                {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
 
-                {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
-                {"x":10.5, "y":3.75, "matrix": [8, 1]},
-                {"x":11.5, "y":3.25, "matrix": [8, 2]},
-                {"x":12.5, "y":3, "matrix": [8, 3]},
-                {"x":13.5, "y":3.25, "matrix": [8, 4]},
-                {"x":14.5, "y":3.75, "matrix": [8, 5]},
-                {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
 
-                {"x":0.25, "y":5, "matrix": [4, 0]},
-                {"x":1.5, "y":4.75, "matrix": [4, 1]},
-                {"x":2.5, "y":4.25, "matrix": [4, 2]},
-                {"x":3.5, "y":4, "matrix": [4, 3]},
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
 
-                {"x":5, "y":6, "matrix": [4, 4]},
-                {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
-                {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
 
-                {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
-                {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
-                {"x":11, "y":6, "matrix": [9, 2]},
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
 
-                {"x":12.5, "y":4, "matrix": [9, 3]},
-                {"x":13.5, "y":4.25, "matrix": [9, 4]},
-                {"x":14.5, "y":4.75, "matrix": [9, 5]},
-                {"x":15.75, "y":5, "matrix": [9, 6]}
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
             ]
         }
     }
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index 8acde1a159..cb4a939a02 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -21,98 +21,98 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":0, "y":0, "matrix": [4, 0]},
-            {"x":1, "y":0, "matrix": [5, 0]},
-            {"x":2, "y":0, "matrix": [4, 1]},
-            {"x":3, "y":0, "matrix": [5, 1]},
-            {"x":4, "y":0, "matrix": [4, 2]},
-            {"x":5, "y":0, "matrix": [5, 2]},
-            {"x":6.5, "y":0, "matrix": [4, 3]},
-            {"x":7.5, "y":0, "matrix": [5, 3]},
-            {"x":8.5, "y":0, "matrix": [4, 4]},
-            {"x":9.5, "y":0, "matrix": [5, 4]},
-            {"x":10.5, "y":0, "matrix": [4, 5]},
-            {"x":11.5, "y":0, "matrix": [5, 5]},
-            {"x":14, "y":0, "matrix": [4, 6]},
-            {"x":15, "y":0, "matrix": [5, 6]},
-            {"x":16, "y":0, "matrix": [4, 7]},
-            {"x":17, "y":0, "matrix": [5, 7]},
-            {"x":18, "y":0, "matrix": [4, 8]},
-            {"x":19, "y":0, "w":2, "matrix": [5, 8]},
+            {"x": 0, "y": 0, "matrix": [4, 0]},
+            {"x": 1, "y": 0, "matrix": [5, 0]},
+            {"x": 2, "y": 0, "matrix": [4, 1]},
+            {"x": 3, "y": 0, "matrix": [5, 1]},
+            {"x": 4, "y": 0, "matrix": [4, 2]},
+            {"x": 5, "y": 0, "matrix": [5, 2]},
+            {"x": 6.5, "y": 0, "matrix": [4, 3]},
+            {"x": 7.5, "y": 0, "matrix": [5, 3]},
+            {"x": 8.5, "y": 0, "matrix": [4, 4]},
+            {"x": 9.5, "y": 0, "matrix": [5, 4]},
+            {"x": 10.5, "y": 0, "matrix": [4, 5]},
+            {"x": 11.5, "y": 0, "matrix": [5, 5]},
+            {"x": 14, "y": 0, "matrix": [4, 6]},
+            {"x": 15, "y": 0, "matrix": [5, 6]},
+            {"x": 16, "y": 0, "matrix": [4, 7]},
+            {"x": 17, "y": 0, "matrix": [5, 7]},
+            {"x": 18, "y": 0, "matrix": [4, 8]},
+            {"x": 19, "y": 0, "w": 2, "matrix": [5, 8]},
 
-            {"x":0, "y":1, "matrix": [3, 0]},
-            {"x":1, "y":1, "matrix": [6, 0]},
-            {"x":2, "y":1, "matrix": [3, 1]},
-            {"x":3, "y":1, "matrix": [6, 1]},
-            {"x":4, "y":1, "matrix": [3, 2]},
-            {"x":5, "y":1, "matrix": [6, 2]},
-            {"x":6.5, "y":1, "matrix": [3, 3]},
-            {"x":7.5, "y":1, "matrix": [6, 3]},
-            {"x":8.5, "y":1, "matrix": [3, 4]},
-            {"x":9.5, "y":1, "matrix": [6, 4]},
-            {"x":10.5, "y":1, "matrix": [3, 5]},
-            {"x":11.5, "y":1, "matrix": [6, 5]},
-            {"x":14, "y":1, "matrix": [3, 6]},
-            {"x":15, "y":1, "matrix": [6, 6]},
-            {"x":16, "y":1, "matrix": [3, 7]},
-            {"x":17, "y":1, "matrix": [6, 7]},
-            {"x":18, "y":1, "matrix": [3, 8]},
-            {"x":19, "y":1, "matrix": [6, 8]},
-            {"x":20, "y":1, "matrix": [3, 9]},
+            {"x": 0, "y": 1, "matrix": [3, 0]},
+            {"x": 1, "y": 1, "matrix": [6, 0]},
+            {"x": 2, "y": 1, "matrix": [3, 1]},
+            {"x": 3, "y": 1, "matrix": [6, 1]},
+            {"x": 4, "y": 1, "matrix": [3, 2]},
+            {"x": 5, "y": 1, "matrix": [6, 2]},
+            {"x": 6.5, "y": 1, "matrix": [3, 3]},
+            {"x": 7.5, "y": 1, "matrix": [6, 3]},
+            {"x": 8.5, "y": 1, "matrix": [3, 4]},
+            {"x": 9.5, "y": 1, "matrix": [6, 4]},
+            {"x": 10.5, "y": 1, "matrix": [3, 5]},
+            {"x": 11.5, "y": 1, "matrix": [6, 5]},
+            {"x": 14, "y": 1, "matrix": [3, 6]},
+            {"x": 15, "y": 1, "matrix": [6, 6]},
+            {"x": 16, "y": 1, "matrix": [3, 7]},
+            {"x": 17, "y": 1, "matrix": [6, 7]},
+            {"x": 18, "y": 1, "matrix": [3, 8]},
+            {"x": 19, "y": 1, "matrix": [6, 8]},
+            {"x": 20, "y": 1, "matrix": [3, 9]},
 
-            {"x":0, "y":2, "matrix": [2, 0]},
-            {"x":1, "y":2, "matrix": [7, 0]},
-            {"x":2, "y":2, "matrix": [2, 1]},
-            {"x":3, "y":2, "matrix": [7, 1]},
-            {"x":4, "y":2, "matrix": [2, 2]},
-            {"x":5, "y":2, "matrix": [7, 2]},
-            {"x":6.5, "y":2, "w":1.25, "matrix": [2, 3]},
-            {"x":7.75, "y":2, "matrix": [7, 3]},
-            {"x":8.75, "y":2, "matrix": [2, 4]},
-            {"x":9.75, "y":2, "matrix": [7, 4]},
-            {"x":10.75, "y":2, "matrix": [2, 5]},
-            {"x":11.75, "y":2, "matrix": [7, 5]},
-            {"x":14.25, "y":2, "matrix": [2, 6]},
-            {"x":15.25, "y":2, "matrix": [7, 6]},
-            {"x":16.25, "y":2, "matrix": [2, 7]},
-            {"x":17.25, "y":2, "matrix": [7, 7]},
-            {"x":18.25, "y":2, "matrix": [2, 8]},
-            {"x":19.25, "y":2, "w":1.75, "matrix": [2, 9]},
+            {"x": 0, "y": 2, "matrix": [2, 0]},
+            {"x": 1, "y": 2, "matrix": [7, 0]},
+            {"x": 2, "y": 2, "matrix": [2, 1]},
+            {"x": 3, "y": 2, "matrix": [7, 1]},
+            {"x": 4, "y": 2, "matrix": [2, 2]},
+            {"x": 5, "y": 2, "matrix": [7, 2]},
+            {"x": 6.5, "y": 2, "w": 1.25, "matrix": [2, 3]},
+            {"x": 7.75, "y": 2, "matrix": [7, 3]},
+            {"x": 8.75, "y": 2, "matrix": [2, 4]},
+            {"x": 9.75, "y": 2, "matrix": [7, 4]},
+            {"x": 10.75, "y": 2, "matrix": [2, 5]},
+            {"x": 11.75, "y": 2, "matrix": [7, 5]},
+            {"x": 14.25, "y": 2, "matrix": [2, 6]},
+            {"x": 15.25, "y": 2, "matrix": [7, 6]},
+            {"x": 16.25, "y": 2, "matrix": [2, 7]},
+            {"x": 17.25, "y": 2, "matrix": [7, 7]},
+            {"x": 18.25, "y": 2, "matrix": [2, 8]},
+            {"x": 19.25, "y": 2, "w": 1.75, "matrix": [2, 9]},
 
-            {"x":0, "y":3, "matrix": [1, 0]},
-            {"x":1, "y":3, "matrix": [8, 0]},
-            {"x":2, "y":3, "matrix": [1, 1]},
-            {"x":3, "y":3, "matrix": [8, 1]},
-            {"x":4, "y":3, "matrix": [1, 2]},
-            {"x":5, "y":3, "matrix": [8, 2]},
-            {"x":6.5, "y":3, "w":1.75, "matrix": [1, 3]},
-            {"x":8.25, "y":3, "matrix": [8, 3]},
-            {"x":9.25, "y":3, "matrix": [1, 4]},
-            {"x":10.25, "y":3, "matrix": [8, 4]},
-            {"x":11.25, "y":3, "matrix": [1, 5]},
-            {"x":12.25, "y":3, "matrix": [8, 5]},
-            {"x":13.75, "y":3, "matrix": [1, 6]},
-            {"x":14.75, "y":3, "matrix": [8, 6]},
-            {"x":15.75, "y":3, "matrix": [1, 7]},
-            {"x":16.75, "y":3, "matrix": [8, 7]},
-            {"x":17.75, "y":3, "matrix": [1, 8]},
-            {"x":18.75, "y":3, "matrix": [8, 8]},
-            {"x":19.75, "y":3, "w":1.25, "matrix": [1, 9]},
+            {"x": 0, "y": 3, "matrix": [1, 0]},
+            {"x": 1, "y": 3, "matrix": [8, 0]},
+            {"x": 2, "y": 3, "matrix": [1, 1]},
+            {"x": 3, "y": 3, "matrix": [8, 1]},
+            {"x": 4, "y": 3, "matrix": [1, 2]},
+            {"x": 5, "y": 3, "matrix": [8, 2]},
+            {"x": 6.5, "y": 3, "w": 1.75, "matrix": [1, 3]},
+            {"x": 8.25, "y": 3, "matrix": [8, 3]},
+            {"x": 9.25, "y": 3, "matrix": [1, 4]},
+            {"x": 10.25, "y": 3, "matrix": [8, 4]},
+            {"x": 11.25, "y": 3, "matrix": [1, 5]},
+            {"x": 12.25, "y": 3, "matrix": [8, 5]},
+            {"x": 13.75, "y": 3, "matrix": [1, 6]},
+            {"x": 14.75, "y": 3, "matrix": [8, 6]},
+            {"x": 15.75, "y": 3, "matrix": [1, 7]},
+            {"x": 16.75, "y": 3, "matrix": [8, 7]},
+            {"x": 17.75, "y": 3, "matrix": [1, 8]},
+            {"x": 18.75, "y": 3, "matrix": [8, 8]},
+            {"x": 19.75, "y": 3, "w": 1.25, "matrix": [1, 9]},
 
-            {"x":0, "y":4, "matrix": [0, 0]},
-            {"x":1, "y":4, "matrix": [9, 0]},
-            {"x":2, "y":4, "matrix": [0, 1]},
-            {"x":3, "y":4, "matrix": [9, 1]},
-            {"x":4, "y":4, "matrix": [0, 2]},
-            {"x":5, "y":4, "matrix": [9, 2]},
-            {"x":6.5, "y":4, "w":1.25, "matrix": [0, 3]},
-            {"x":7.75, "y":4, "w":1.25, "matrix": [9, 3]},
-            {"x":10.25, "y":4, "w":1.25, "matrix": [0, 4]},
-            {"x":11.5, "y":4, "w":1.75, "matrix": [9, 5]},
-            {"x":13.75, "y":4, "w":1.75, "matrix": [0, 6]},
-            {"x":15.5, "y":4, "w":1.25, "matrix": [9, 7]},
-            {"x":18.5, "y":4, "w":1.25, "matrix": [9, 8]},
-            {"x":19.75, "y":4, "w":1.25, "matrix": [0, 9]}
+            {"x": 0, "y": 4, "matrix": [0, 0]},
+            {"x": 1, "y": 4, "matrix": [9, 0]},
+            {"x": 2, "y": 4, "matrix": [0, 1]},
+            {"x": 3, "y": 4, "matrix": [9, 1]},
+            {"x": 4, "y": 4, "matrix": [0, 2]},
+            {"x": 5, "y": 4, "matrix": [9, 2]},
+            {"x": 6.5, "y": 4, "w": 1.25, "matrix": [0, 3]},
+            {"x": 7.75, "y": 4, "w": 1.25, "matrix": [9, 3]},
+            {"x": 10.25, "y": 4, "w": 1.25, "matrix": [0, 4]},
+            {"x": 11.5, "y": 4, "w": 1.75, "matrix": [9, 5]},
+            {"x": 13.75, "y": 4, "w": 1.75, "matrix": [0, 6]},
+            {"x": 15.5, "y": 4, "w": 1.25, "matrix": [9, 7]},
+            {"x": 18.5, "y": 4, "w": 1.25, "matrix": [9, 8]},
+            {"x": 19.75, "y": 4, "w": 1.25, "matrix": [0, 9]}
           ]
       }
   }
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
index 793ebbd32f..dfc1198c58 100644
--- a/keyboards/handwired/split89/info.json
+++ b/keyboards/handwired/split89/info.json
@@ -27,95 +27,95 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                    {"label":"Esc", "matrix": [0, 4], "x":0, "y":0},
-                    {"label":"F1", "matrix": [0, 5], "x":2, "y":0},
-                    {"label":"F2", "matrix": [0, 6], "x":3, "y":0},
-                    {"label":"F3", "matrix": [0, 7], "x":4, "y":0},
-                    {"label":"F4", "matrix": [0, 8], "x":5, "y":0},
-                    {"label":"F5", "matrix": [0, 9], "x":6, "y":0},
-                    {"label":"F6", "matrix": [6, 0], "x":10.25, "y":0},
-                    {"label":"F7", "matrix": [6, 1], "x":11.25, "y":0},
-                    {"label":"F8", "matrix": [6, 2], "x":12.25, "y":0},
-                    {"label":"F9", "matrix": [6, 3], "x":13.75, "y":0},
-                    {"label":"F10", "matrix": [6, 4], "x":14.75, "y":0},
-                    {"label":"F11", "matrix": [6, 5], "x":15.75, "y":0},
-                    {"label":"F12", "matrix": [6, 6], "x":16.75, "y":0},
-                    {"label":"PrtSc", "matrix": [6, 7], "x":18, "y":0},
-                    {"label":"Scroll Lock", "matrix": [6, 8], "x":19, "y":0},
-                    {"label":"Pause", "matrix": [6, 9], "x":20, "y":0},
-                    {"label":"~", "matrix": [2, 4], "x":0, "y":1.5},
-                    {"label":"1!", "matrix": [1, 4], "x":1, "y":1.5},
-                    {"label":"2@", "matrix": [1, 5], "x":2, "y":1.5},
-                    {"label":"3#", "matrix": [1, 6], "x":3, "y":1.5},
-                    {"label":"4$", "matrix": [1, 7], "x":4, "y":1.5},
-                    {"label":"5%", "matrix": [1, 8], "x":5, "y":1.5},
-                    {"label":"6^", "matrix": [1, 9], "x":6, "y":1.5},
-                    {"label":"7&", "matrix": [7, 0], "x":9.75, "y":1.5},
-                    {"label":"8*", "matrix": [7, 1], "x":10.75, "y":1.5},
-                    {"label":"9(", "matrix": [7, 2], "x":11.75, "y":1.5},
-                    {"label":"0)", "matrix": [7, 3], "x":12.75, "y":1.5},
-                    {"label":"-_", "matrix": [7, 4], "x":13.75, "y":1.5},
-                    {"label":"=+", "matrix": [7, 5], "x":14.75, "y":1.5},
-                    {"label":"Backspace", "matrix": [7, 6], "x":15.75, "y":1.5, "w":2},
-                    {"label":"Insert", "matrix": [7, 7], "x":18, "y":1.5},
-                    {"label":"Home", "matrix": [7, 8], "x":19, "y":1.5},
-                    {"label":"PgUp", "matrix": [7, 9], "x":20, "y":1.5},
-                    {"label":"Tab", "matrix": [3, 4], "x":0, "y":2.5, "w":1.5},
-                    {"label":"Q", "matrix": [2, 5], "x":1.5, "y":2.5},
-                    {"label":"W", "matrix": [2, 6], "x":2.5, "y":2.5},
-                    {"label":"E", "matrix": [2, 7], "x":3.5, "y":2.5},
-                    {"label":"R", "matrix": [2, 8], "x":4.5, "y":2.5},
-                    {"label":"T", "matrix": [2, 9], "x":5.5, "y":2.5},
-                    {"label":"Y", "matrix": [9, 0], "x":9.25, "y":2.5},
-                    {"label":"U", "matrix": [8, 0], "x":10.25, "y":2.5},
-                    {"label":"I", "matrix": [8, 1], "x":11.25, "y":2.5},
-                    {"label":"O", "matrix": [8, 2], "x":12.25, "y":2.5},
-                    {"label":"P", "matrix": [8, 3], "x":13.25, "y":2.5},
-                    {"label":"{", "matrix": [8, 4], "x":14.25, "y":2.5},
-                    {"label":"}", "matrix": [8, 5], "x":15.25, "y":2.5},
-                    {"label":"|", "matrix": [8, 6], "x":16.25, "y":2.5, "w":1.5},
-                    {"label":"Delete", "matrix": [8, 7], "x":18, "y":2.5},
-                    {"label":"End", "matrix": [8, 8], "x":19, "y":2.5},
-                    {"label":"PgDn", "matrix": [8, 9], "x":20, "y":2.5},
-                    {"label":"Caps Lock", "matrix": [4, 4], "x":0, "y":3.5, "w":1.75},
-                    {"label":"A", "matrix": [3, 5], "x":1.75, "y":3.5},
-                    {"label":"S", "matrix": [3, 6], "x":2.75, "y":3.5},
-                    {"label":"D", "matrix": [3, 7], "x":3.75, "y":3.5},
-                    {"label":"F", "matrix": [3, 8], "x":4.75, "y":3.5},
-                    {"label":"G", "matrix": [3, 9], "x":5.75, "y":3.5},
-                    {"label":"H", "matrix": [10, 0], "x":9.5, "y":3.5},
-                    {"label":"J", "matrix": [9, 1], "x":10.5, "y":3.5},
-                    {"label":"K", "matrix": [9, 2], "x":11.5, "y":3.5},
-                    {"label":"L", "matrix": [9, 3], "x":12.5, "y":3.5},
-                    {"label":":", "matrix": [9, 4], "x":13.5, "y":3.5},
-                    {"label":"\"", "matrix": [9, 5], "x":14.5, "y":3.5},
-                    {"label":"Enter", "matrix": [9, 6], "x":15.5, "y":3.5, "w":2.25},
-                    {"label":"Shift", "matrix": [5, 4], "x":0, "y":4.5, "w":2.25},
-                    {"label":"Z", "matrix": [4, 5], "x":2.25, "y":4.5},
-                    {"label":"X", "matrix": [4, 6], "x":3.25, "y":4.5},
-                    {"label":"C", "matrix": [4, 7], "x":4.25, "y":4.5},
-                    {"label":"V", "matrix": [4, 8], "x":5.25, "y":4.5},
-                    {"label":"B", "matrix": [4, 9], "x":6.25, "y":4.5},
-                    {"label":"N", "matrix": [11, 0], "x":10, "y":4.5},
-                    {"label":"M", "matrix": [10, 1], "x":11, "y":4.5},
-                    {"label":"<", "matrix": [10, 2], "x":12, "y":4.5},
-                    {"label":">", "matrix": [10, 3], "x":13, "y":4.5},
-                    {"label":"?", "matrix": [10, 4], "x":14, "y":4.5},
-                    {"label":"Shift", "matrix": [10, 6], "x":15, "y":4.5, "w":2.75},
-                    {"label":"\u2191", "matrix": [10, 8], "x":19, "y":4.5},
-                    {"label":"Ctrl", "matrix": [5, 5], "x":0, "y":5.5, "w":1.25},
-                    {"label":"Fn", "matrix": [5, 6], "x":1.25, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [5, 7], "x":2.5, "y":5.5, "w":1.25},
-                    {"label":"Alt", "matrix": [5, 8], "x":3.75, "y":5.5, "w":1.25},
-                    {"label":"Space", "matrix": [5, 9], "x":5, "y":5.5, "w":2.25},
-                    {"label":"Space", "matrix": [11, 1], "x":10, "y":5.5, "w":2.75},
-                    {"label":"Alt", "matrix": [11, 3], "x":12.75, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [11, 4], "x":14, "y":5.5, "w":1.25},
-                    {"label":"Menu", "matrix": [11, 5], "x":15.25, "y":5.5, "w":1.25},
-                    {"label":"Ctrl", "matrix": [11, 6], "x":16.5, "y":5.5, "w":1.25},
-                    {"label":"\u2190", "matrix": [11, 7], "x":18, "y":5.5},
-                    {"label":"\u2193", "matrix": [11, 8], "x":19, "y":5.5},
-                    {"label":"\u2192", "matrix": [11, 9], "x":20, "y":5.5}
+                    {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
+                    {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
+                    {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
+                    {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
+                    {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
+                    {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
+                    {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
+                    {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
+                    {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
+                    {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
+                    {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
+                    {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
+                    {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
+                    {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
+                    {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
+                    {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
+                    {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
+                    {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
+                    {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
+                    {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
+                    {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
+                    {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
+                    {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
+                    {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
+                    {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
+                    {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
+                    {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
+                    {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
+                    {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
+                    {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
+                    {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
+                    {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
+                    {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
+                    {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
+                    {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
+                    {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
+                    {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
+                    {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
+                    {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
+                    {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
+                    {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
+                    {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
+                    {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
+                    {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
+                    {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
+                    {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
+                    {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
+                    {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
+                    {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
+                    {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
+                    {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
+                    {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
+                    {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
+                    {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
+                    {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
+                    {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
+                    {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
+                    {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+                    {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
+                    {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
+                    {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
+                    {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
+                    {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
+                    {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
+                    {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
+                    {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
+                    {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
+                    {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
+                    {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
+                    {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
+                    {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
+                    {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
+                    {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
+                    {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
+                    {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
+                    {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
+                    {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
+                    {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
+                    {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
+                    {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
+                    {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
+                    {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
+                    {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
+                    {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
+                    {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
+                    {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
+                    {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
                     ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 937d462918..074a5f8954 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -20,12 +20,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index 1e67a91d48..8bd5ca4fcc 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -19,14 +19,14 @@
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
             ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 4bfe269ee6..be24426de0 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -19,16 +19,16 @@
     "layouts": {
         "LAYOUT_ortho_2x5": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]}
             ]
         }
     }