diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
index f4f163ccc19..303d5923e9d 100644
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -172,7 +172,7 @@
           {"label":"", "x":0, "y":3},
           {"label":"", "x":1, "y":3},
           {"label":"", "x":2, "y":3},
-          {"label":"", "x":3, "y":3, "w":6.00},
+          {"label":"", "x":3, "y":3, "w":6},
           {"label":"", "x":9, "y":3},
           {"label":"", "x":10, "y":3},
           {"label":"", "x":11.25, "y":3.25},
diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json
index 6eed9347391..a810ad4cc72 100644
--- a/keyboards/ai03/lunar_ii/info.json
+++ b/keyboards/ai03/lunar_ii/info.json
@@ -25,67 +25,67 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4.0 },
-                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4.0 },
-                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4.0 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4.0 },
-                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [2, 12], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
+                { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 1.5, "y": 4 },
+                { "matrix": [4, 3], "w": 1.5, "x": 2.75, "y": 4 },
+                { "matrix": [4, 7], "w": 6.5, "x": 4.25, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 10.75, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.25, "y": 4 },
+                { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
index ef52a070e2d..dbc9f40d19e 100644
--- a/keyboards/ai03/orbit_x/info.json
+++ b/keyboards/ai03/orbit_x/info.json
@@ -42,12 +42,12 @@
                 {"x":0, "y":1.38},
                 {"x":1, "y":1.38},
                 {"x":2, "y":1.13},
-                {"x":3, "y":1.0},
+                {"x":3, "y":1},
                 {"x":4, "y":1.13},
                 {"x":5, "y":1.25},
                 {"x":7.5, "y":1.25},
                 {"x":8.5, "y":1.13},
-                {"x":9.5, "y":1.0},
+                {"x":9.5, "y":1},
                 {"x":10.5, "y":1.13},
                 {"x":11.5, "y":1.38},
                 {"x":12.5, "y":1.38},
diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json
index f2583154ba4..023788372df 100644
--- a/keyboards/akb/ogr/info.json
+++ b/keyboards/akb/ogr/info.json
@@ -29,85 +29,85 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.5, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.5, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.5, "y": 0.0 },
-                { "matrix": [0, 15], "x": 15.5, "y": 0.0 },
-                { "matrix": [0, 16], "x": 16.5, "y": 0.0 },
-                { "matrix": [0, 17], "x": 17.5, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 4.0, "y": 1.0 },
-                { "matrix": [1, 4], "x": 5.0, "y": 1.0 },
-                { "matrix": [1, 5], "x": 6.0, "y": 1.0 },
-                { "matrix": [1, 6], "x": 7.0, "y": 1.0 },
-                { "matrix": [1, 7], "x": 8.0, "y": 1.0 },
-                { "matrix": [1, 8], "x": 9.0, "y": 1.0 },
-                { "matrix": [1, 9], "x": 10.0, "y": 1.0 },
-                { "matrix": [1, 10], "x": 11.0, "y": 1.0 },
-                { "matrix": [1, 11], "x": 12.0, "y": 1.0 },
-                { "matrix": [1, 12], "x": 13.0, "y": 1.0 },
-                { "matrix": [1, 13], "x": 14.0, "y": 1.0 },
-                { "matrix": [1, 14], "x": 15.0, "y": 1.0 },
-                { "matrix": [1, 15], "w": 1.5, "x": 16.0, "y": 1.0 },
-                { "matrix": [1, 16], "x": 17.5, "y": 1.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2.0 },
-                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
-                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
-                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
-                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
-                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
-                { "matrix": [2, 11], "x": 12.25, "y": 2.0 },
-                { "matrix": [2, 12], "x": 13.25, "y": 2.0 },
-                { "matrix": [2, 13], "x": 14.25, "y": 2.0 },
-                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2.0 },
-                { "matrix": [2, 16], "x": 17.5, "y": 2.0 },
-                { "matrix": [3, 0], "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.0, "y": 3.0 },
-                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.75, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.0 },
-                { "matrix": [3, 12], "x": 12.75, "y": 3.0 },
-                { "matrix": [3, 13], "x": 13.75, "y": 3.0 },
-                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3.0 },
-                { "matrix": [3, 15], "x": 16.5, "y": 3.0 },
-                { "matrix": [3, 16], "x": 17.5, "y": 3.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 1], "x": 1.0, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4.0 },
-                { "matrix": [4, 4], "w": 1.25, "x": 5.0, "y": 4.0 },
-                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4.0 },
-                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
-                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 },
-                { "matrix": [4, 14], "x": 15.5, "y": 4.0 },
-                { "matrix": [4, 15], "x": 16.5, "y": 4.0 },
-                { "matrix": [4, 16], "x": 17.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [0, 12], "x": 12.5, "y": 0 },
+                { "matrix": [0, 13], "x": 13.5, "y": 0 },
+                { "matrix": [0, 14], "x": 14.5, "y": 0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0 },
+                { "matrix": [0, 16], "x": 16.5, "y": 0 },
+                { "matrix": [0, 17], "x": 17.5, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 4, "y": 1 },
+                { "matrix": [1, 4], "x": 5, "y": 1 },
+                { "matrix": [1, 5], "x": 6, "y": 1 },
+                { "matrix": [1, 6], "x": 7, "y": 1 },
+                { "matrix": [1, 7], "x": 8, "y": 1 },
+                { "matrix": [1, 8], "x": 9, "y": 1 },
+                { "matrix": [1, 9], "x": 10, "y": 1 },
+                { "matrix": [1, 10], "x": 11, "y": 1 },
+                { "matrix": [1, 11], "x": 12, "y": 1 },
+                { "matrix": [1, 12], "x": 13, "y": 1 },
+                { "matrix": [1, 13], "x": 14, "y": 1 },
+                { "matrix": [1, 14], "x": 15, "y": 1 },
+                { "matrix": [1, 15], "w": 1.5, "x": 16, "y": 1 },
+                { "matrix": [1, 16], "x": 17.5, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2 },
+                { "matrix": [2, 11], "x": 12.25, "y": 2 },
+                { "matrix": [2, 12], "x": 13.25, "y": 2 },
+                { "matrix": [2, 13], "x": 14.25, "y": 2 },
+                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2 },
+                { "matrix": [2, 16], "x": 17.5, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3 },
+                { "matrix": [3, 12], "x": 12.75, "y": 3 },
+                { "matrix": [3, 13], "x": 13.75, "y": 3 },
+                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3 },
+                { "matrix": [3, 16], "x": 17.5, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "matrix": [4, 1], "x": 1, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 4], "w": 1.25, "x": 5, "y": 4 },
+                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4 },
+                { "matrix": [4, 16], "x": 17.5, "y": 4 }
             ]
         }
    
diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/info.json
index 39f5422b538..637f3014d7c 100644
--- a/keyboards/akb/vero/info.json
+++ b/keyboards/akb/vero/info.json
@@ -30,68 +30,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
-                { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 5], "w": 3.0, "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 7], "w": 3.0, "x": 7.0, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 5], "w": 3, "x": 4, "y": 4 },
+                { "matrix": [4, 7], "w": 3, "x": 7, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/basekeys/slice/rev1_rgb/info.json b/keyboards/basekeys/slice/rev1_rgb/info.json
index dfbdde65d65..9c42a8aeec6 100644
--- a/keyboards/basekeys/slice/rev1_rgb/info.json
+++ b/keyboards/basekeys/slice/rev1_rgb/info.json
@@ -20,13 +20,13 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":2.75}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         },
         "LAYOUT_split_left_space": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":1.75}, {"x":7.5, "y":4}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.660, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.390, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.66, "y":0}, {"label":"!", "x":2.66, "y":0}, {"label":"@", "x":3.66, "y":0}, {"label":"#", "x":4.66, "y":0}, {"label":"$", "x":5.66, "y":0}, {"label":"%", "x":6.66, "y":0}, {"label":"^", "x":7.66, "y":0}, {"label":"&", "x":9.32, "y":0}, {"label":"*", "x":10.32, "y":0}, {"label":"(", "x":11.32, "y":0}, {"label":")", "x":12.32, "y":0}, {"label":"_", "x":13.32, "y":0}, {"label":"+", "x":14.32, "y":0}, {"label":"Backspace", "x":15.32, "y":0, "w":2}, {"x":0, "y":1}, {"label":"Tab", "x":1.53, "y":1, "w":1.5}, {"label":"Q", "x":3.03, "y":1}, {"label":"W", "x":4.03, "y":1}, {"label":"E", "x":5.03, "y":1}, {"label":"R", "x":6.03, "y":1}, {"label":"T", "x":7.03, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15.05, "y":1}, {"label":"|", "x":16.1, "y":1, "w":1.5}, {"x":0, "y":2}, {"label":"Caps Lock", "x":1.39, "y":2, "w":1.75}, {"label":"A", "x":3.14, "y":2}, {"label":"S", "x":4.14, "y":2}, {"label":"D", "x":5.14, "y":2}, {"label":"F", "x":6.14, "y":2}, {"label":"G", "x":7.14, "y":2}, {"label":"H", "x":9.34, "y":2}, {"label":"J", "x":10.34, "y":2}, {"label":"K", "x":11.34, "y":2}, {"label":"L", "x":12.34, "y":2}, {"label":":", "x":13.34, "y":2}, {"label":"\"", "x":14.34, "y":2}, {"label":"Enter", "x":15.34, "y":2, "w":2.25}, {"x":0, "y":3}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":8.97, "y":3}, {"label":"N", "x":9.97, "y":3}, {"label":"M", "x":10.97, "y":3}, {"label":"<", "x":11.97, "y":3}, {"label":">", "x":12.97, "y":3}, {"label":"?", "x":13.97, "y":3}, {"label":"Shift", "x":14.97, "y":3, "w":1.75}, {"label":"Shift", "x":16.72, "y":3}, {"x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.25}, {"label":"\u21d3", "x":4.75, "y":4}, {"x":5.75, "y":4, "w":0.917}, {"x":6.667, "y":4, "w":0.916}, {"x":7.583, "y":4, "w":0.917}, {"x":8.97, "y":4, "w":2.25}, {"label":"\u21d1", "x":11.22, "y":4}, {"label":"Alt", "x":13.98, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.23, "y":4, "w":1.25}, {"label":"Fn", "x":16.48, "y":4}]
         }
     }
 }
diff --git a/keyboards/botanicalkeyboards/fm2u/info.json b/keyboards/botanicalkeyboards/fm2u/info.json
index 0d4dd1e88be..3f9009625d9 100644
--- a/keyboards/botanicalkeyboards/fm2u/info.json
+++ b/keyboards/botanicalkeyboards/fm2u/info.json
@@ -42,7 +42,7 @@
         },
         "LAYOUT_1u5": {
             "layout": [
-                {"x": 0, "y": 0, "w": 1.50, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "w": 1.5, "matrix": [0, 0]}
             ]
         },
         "LAYOUT_1u75": {
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
index 0515152901b..64ca1975b67 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -34,44 +34,44 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.5, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.5, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.5, "y": 0.0 },
-                { "matrix": [0, 17], "x": 18.5, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.5, "y": 0 },
+                { "matrix": [0, 15], "x": 16.5, "y": 0 },
+                { "matrix": [0, 16], "x": 17.5, "y": 0 },
+                { "matrix": [0, 17], "x": 18.5, "y": 0 },
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 12], "x": 14, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 },
                 { "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 },
                 { "matrix": [1, 17], "x": 18.5, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -89,7 +89,7 @@
                 { "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 },
                 { "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 },
                 { "matrix": [2, 17], "x": 18.5, "y": 2.25 },
-                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -106,7 +106,7 @@
                 { "matrix": [3, 15], "x": 16.5, "y": 3.25 },
                 { "matrix": [3, 16], "x": 17.5, "y": 3.25 },
                 { "matrix": [3, 17], "x": 18.5, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -124,11 +124,11 @@
                 { "matrix": [4, 15], "x": 16.5, "y": 4.25 },
                 { "matrix": [4, 16], "x": 17.5, "y": 4.25 },
                 { "matrix": [4, 17], "x": 18.5, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 },
                 { "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 },
                 { "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/info.json
index 9fb4da4c930..1b3bd40e675 100644
--- a/keyboards/cannonkeys/caerdroia/info.json
+++ b/keyboards/cannonkeys/caerdroia/info.json
@@ -31,41 +31,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 12], "x": 14.0, "y": 1.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": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 12], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -82,7 +82,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -95,7 +95,7 @@
                 { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.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 },
@@ -108,13 +108,13 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "matrix": [5, 11], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
                 { "matrix": [5, 12], "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/info.json
index bea5e6b7c8a..be1e83e1904 100644
--- a/keyboards/cannonkeys/chimera65_hs/info.json
+++ b/keyboards/cannonkeys/chimera65_hs/info.json
@@ -30,70 +30,70 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [1, 14], "x": 15.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [2, 14], "x": 15.5, "y": 2.0 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [0, 14], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [1, 14], "x": 15.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [2, 14], "x": 15.5, "y": 2 },
+                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
                 { "matrix": [3, 13], "x": 14.25, "y": 3.25 },
-                { "matrix": [3, 14], "x": 15.5, "y": 3.0 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4.0 },
+                { "matrix": [3, 14], "x": 15.5, "y": 3 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4 },
                 { "matrix": [4, 12], "x": 13.25, "y": 4.25 },
                 { "matrix": [4, 13], "x": 14.25, "y": 4.25 },
                 { "matrix": [4, 14], "x": 15.25, "y": 4.25 }
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
index 7788b893bfb..461ec4971e5 100644
--- a/keyboards/cannonkeys/ellipse/info.json
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -36,71 +36,71 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
-                { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+                { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
index 76cb0cfae2e..f83f26bcaa2 100644
--- a/keyboards/cannonkeys/ellipse_hs/info.json
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -26,68 +26,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
index 462c42d9b6c..63da2b29e48 100644
--- a/keyboards/cannonkeys/moment/info.json
+++ b/keyboards/cannonkeys/moment/info.json
@@ -36,70 +36,70 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/info.json
index 721eb80ad26..098d0dc4cf3 100644
--- a/keyboards/cannonkeys/moment_hs/info.json
+++ b/keyboards/cannonkeys/moment_hs/info.json
@@ -30,68 +30,68 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "label": "Bksp", "matrix": [0, 14], "x": 13.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
-                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
-                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
-                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+                { "label": "Bksp", "matrix": [0, 14], "x": 13, "y": 0 },
+                { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+                { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+                { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+                { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+                { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/info.json
index 03e1a28f301..0f7c6ba0c69 100644
--- a/keyboards/cannonkeys/ortho60v2/info.json
+++ b/keyboards/cannonkeys/ortho60v2/info.json
@@ -38,66 +38,66 @@
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
-                { "label": "`", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "label": "2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "label": "3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "label": "4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "label": "5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "label": "6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "label": "7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "label": "8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "label": "9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "label": "0", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "label": "Del", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "label": "Tab", "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "label": "W", "matrix": [1, 2], "x": 2.0, "y": 1.0 },
-                { "label": "E", "matrix": [1, 3], "x": 3.0, "y": 1.0 },
-                { "label": "R", "matrix": [1, 4], "x": 4.0, "y": 1.0 },
-                { "label": "T", "matrix": [1, 5], "x": 5.0, "y": 1.0 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.0, "y": 1.0 },
-                { "label": "U", "matrix": [1, 7], "x": 7.0, "y": 1.0 },
-                { "label": "I", "matrix": [1, 8], "x": 8.0, "y": 1.0 },
-                { "label": "O", "matrix": [1, 9], "x": 9.0, "y": 1.0 },
-                { "label": "P", "matrix": [1, 10], "x": 10.0, "y": 1.0 },
-                { "label": "Back Space", "matrix": [1, 11], "x": 11.0, "y": 1.0 },
-                { "label": "Esc", "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "label": "A", "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "label": "S", "matrix": [2, 2], "x": 2.0, "y": 2.0 },
-                { "label": "D", "matrix": [2, 3], "x": 3.0, "y": 2.0 },
-                { "label": "F", "matrix": [2, 4], "x": 4.0, "y": 2.0 },
-                { "label": "G", "matrix": [2, 5], "x": 5.0, "y": 2.0 },
-                { "label": "H", "matrix": [2, 6], "x": 6.0, "y": 2.0 },
-                { "label": "J", "matrix": [2, 7], "x": 7.0, "y": 2.0 },
-                { "label": "K", "matrix": [2, 8], "x": 8.0, "y": 2.0 },
-                { "label": "L", "matrix": [2, 9], "x": 9.0, "y": 2.0 },
-                { "label": ";", "matrix": [2, 10], "x": 10.0, "y": 2.0 },
-                { "label": "'", "matrix": [2, 11], "x": 11.0, "y": 2.0 },
-                { "label": "Shift", "matrix": [3, 0], "x": 0.0, "y": 3.0 },
-                { "label": "Z", "matrix": [3, 1], "x": 1.0, "y": 3.0 },
-                { "label": "X", "matrix": [3, 2], "x": 2.0, "y": 3.0 },
-                { "label": "C", "matrix": [3, 3], "x": 3.0, "y": 3.0 },
-                { "label": "V", "matrix": [3, 4], "x": 4.0, "y": 3.0 },
-                { "label": "B", "matrix": [3, 5], "x": 5.0, "y": 3.0 },
-                { "label": "N", "matrix": [3, 6], "x": 6.0, "y": 3.0 },
-                { "label": "M", "matrix": [3, 7], "x": 7.0, "y": 3.0 },
-                { "label": ",", "matrix": [3, 8], "x": 8.0, "y": 3.0 },
-                { "label": ".", "matrix": [3, 9], "x": 9.0, "y": 3.0 },
-                { "label": "/", "matrix": [3, 10], "x": 10.0, "y": 3.0 },
-                { "label": "Return", "matrix": [3, 11], "x": 11.0, "y": 3.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
-                { "label": "Ctrl", "matrix": [4, 1], "x": 1.0, "y": 4.0 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.0, "y": 4.0 },
-                { "label": "Super", "matrix": [4, 3], "x": 3.0, "y": 4.0 },
-                { "label": "Lower", "matrix": [4, 4], "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 5], "x": 5.0, "y": 4.0 },
-                { "matrix": [4, 6], "x": 6.0, "y": 4.0 },
-                { "label": "Raise", "matrix": [4, 7], "x": 7.0, "y": 4.0 },
-                { "label": "&larr;", "matrix": [4, 8], "x": 8.0, "y": 4.0 },
-                { "label": "&darr;", "matrix": [4, 9], "x": 9.0, "y": 4.0 },
-                { "label": "&uarr;", "matrix": [4, 10], "x": 10.0, "y": 4.0 },
-                { "label": "&rarr;", "matrix": [4, 11], "x": 11.0, "y": 4.0 }
+                { "label": "`", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+                { "label": "Del", "matrix": [0, 11], "x": 11, "y": 0 },
+                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
+                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
+                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
+                { "label": "Y", "matrix": [1, 6], "x": 6, "y": 1 },
+                { "label": "U", "matrix": [1, 7], "x": 7, "y": 1 },
+                { "label": "I", "matrix": [1, 8], "x": 8, "y": 1 },
+                { "label": "O", "matrix": [1, 9], "x": 9, "y": 1 },
+                { "label": "P", "matrix": [1, 10], "x": 10, "y": 1 },
+                { "label": "Back Space", "matrix": [1, 11], "x": 11, "y": 1 },
+                { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2 },
+                { "label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
+                { "label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+                { "label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
+                { "label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
+                { "label": "H", "matrix": [2, 6], "x": 6, "y": 2 },
+                { "label": "J", "matrix": [2, 7], "x": 7, "y": 2 },
+                { "label": "K", "matrix": [2, 8], "x": 8, "y": 2 },
+                { "label": "L", "matrix": [2, 9], "x": 9, "y": 2 },
+                { "label": ";", "matrix": [2, 10], "x": 10, "y": 2 },
+                { "label": "'", "matrix": [2, 11], "x": 11, "y": 2 },
+                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
+                { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
+                { "label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
+                { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+                { "label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
+                { "label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
+                { "label": "N", "matrix": [3, 6], "x": 6, "y": 3 },
+                { "label": "M", "matrix": [3, 7], "x": 7, "y": 3 },
+                { "label": ",", "matrix": [3, 8], "x": 8, "y": 3 },
+                { "label": ".", "matrix": [3, 9], "x": 9, "y": 3 },
+                { "label": "/", "matrix": [3, 10], "x": 10, "y": 3 },
+                { "label": "Return", "matrix": [3, 11], "x": 11, "y": 3 },
+                { "matrix": [4, 0], "x": 0, "y": 4 },
+                { "label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4 },
+                { "label": "Alt", "matrix": [4, 2], "x": 2, "y": 4 },
+                { "label": "Super", "matrix": [4, 3], "x": 3, "y": 4 },
+                { "label": "Lower", "matrix": [4, 4], "x": 4, "y": 4 },
+                { "matrix": [4, 5], "x": 5, "y": 4 },
+                { "matrix": [4, 6], "x": 6, "y": 4 },
+                { "label": "Raise", "matrix": [4, 7], "x": 7, "y": 4 },
+                { "label": "&larr;", "matrix": [4, 8], "x": 8, "y": 4 },
+                { "label": "&darr;", "matrix": [4, 9], "x": 9, "y": 4 },
+                { "label": "&uarr;", "matrix": [4, 10], "x": 10, "y": 4 },
+                { "label": "&rarr;", "matrix": [4, 11], "x": 11, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
index 9672161bfcd..271589a75f1 100644
--- a/keyboards/cannonkeys/serenity/info.json
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -57,42 +57,42 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
-                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
-                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
-                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "label": "F13", "matrix": [0, 14], "x": 14, "y": 0 },
+                { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0 },
+                { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0 },
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
                 { "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -109,7 +109,7 @@
                 { "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
                 { "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
                 { "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -123,7 +123,7 @@
                 { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
                 { "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -138,11 +138,11 @@
                 { "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
                 { "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
                 { "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/info.json
index d09eb900262..b80474f46ee 100644
--- a/keyboards/cannonkeys/typeb/info.json
+++ b/keyboards/cannonkeys/typeb/info.json
@@ -30,67 +30,67 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
-                { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
-                { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
-                { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
-                { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
-                { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
-                { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
-                { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
-                { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
-                { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
-                { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
-                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
-                { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
-                { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
-                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
-                { "matrix": [4, 6], "w": 6, "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
-                { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [0, 12], "x": 12, "y": 0 },
+                { "matrix": [0, 13], "x": 13, "y": 0 },
+                { "matrix": [2, 12], "x": 14, "y": 0 },
+                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.5, "y": 1 },
+                { "matrix": [1, 2], "x": 2.5, "y": 1 },
+                { "matrix": [1, 3], "x": 3.5, "y": 1 },
+                { "matrix": [1, 4], "x": 4.5, "y": 1 },
+                { "matrix": [1, 5], "x": 5.5, "y": 1 },
+                { "matrix": [1, 6], "x": 6.5, "y": 1 },
+                { "matrix": [1, 7], "x": 7.5, "y": 1 },
+                { "matrix": [1, 8], "x": 8.5, "y": 1 },
+                { "matrix": [1, 9], "x": 9.5, "y": 1 },
+                { "matrix": [1, 10], "x": 10.5, "y": 1 },
+                { "matrix": [1, 11], "x": 11.5, "y": 1 },
+                { "matrix": [1, 12], "x": 12.5, "y": 1 },
+                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1.75, "y": 2 },
+                { "matrix": [2, 2], "x": 2.75, "y": 2 },
+                { "matrix": [2, 3], "x": 3.75, "y": 2 },
+                { "matrix": [2, 4], "x": 4.75, "y": 2 },
+                { "matrix": [2, 5], "x": 5.75, "y": 2 },
+                { "matrix": [2, 6], "x": 6.75, "y": 2 },
+                { "matrix": [2, 7], "x": 7.75, "y": 2 },
+                { "matrix": [2, 8], "x": 8.75, "y": 2 },
+                { "matrix": [2, 9], "x": 9.75, "y": 2 },
+                { "matrix": [2, 10], "x": 10.75, "y": 2 },
+                { "matrix": [2, 11], "x": 11.75, "y": 2 },
+                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "x": 2.25, "y": 3 },
+                { "matrix": [3, 3], "x": 3.25, "y": 3 },
+                { "matrix": [3, 4], "x": 4.25, "y": 3 },
+                { "matrix": [3, 5], "x": 5.25, "y": 3 },
+                { "matrix": [3, 6], "x": 6.25, "y": 3 },
+                { "matrix": [3, 7], "x": 7.25, "y": 3 },
+                { "matrix": [3, 8], "x": 8.25, "y": 3 },
+                { "matrix": [3, 9], "x": 9.25, "y": 3 },
+                { "matrix": [3, 10], "x": 10.25, "y": 3 },
+                { "matrix": [3, 11], "x": 11.25, "y": 3 },
+                { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+                { "matrix": [3, 13], "x": 14, "y": 3 },
+                { "matrix": [4, 1], "x": 1.5, "y": 4 },
+                { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+                { "matrix": [4, 6], "w": 6, "x": 4, "y": 4 },
+                { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+                { "matrix": [4, 11], "x": 11.5, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json
index 53e401f6cfd..b72dee46963 100644
--- a/keyboards/cipulot/rf_r1_8_9xu/info.json
+++ b/keyboards/cipulot/rf_r1_8_9xu/info.json
@@ -54,41 +54,41 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -106,7 +106,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -120,7 +120,7 @@
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
                 { "label": "3,13", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -135,14 +135,14 @@
                 { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 },
                 { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 },
-                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 },
                 { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -152,40 +152,40 @@
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -202,7 +202,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -215,7 +215,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
                 { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
@@ -228,11 +228,11 @@
                 { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -242,40 +242,40 @@
         },
         "LAYOUT_tkl_iso_tsangan": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -292,7 +292,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -305,7 +305,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -319,11 +319,11 @@
                 { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
@@ -333,41 +333,41 @@
         },
         "LAYOUT_tkl_jis": {
             "layout": [
-                { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 },
-                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 },
-                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 },
-                { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+                { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 },
+                { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 },
+                { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 },
+                { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 },
                 { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 },
                 { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
                 { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 },
-                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -384,7 +384,7 @@
                 { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 },
                 { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 },
                 { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 },
-                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -397,7 +397,7 @@
                 { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
-                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
                 { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
                 { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
@@ -411,14 +411,14 @@
                 { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 },
                 { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 },
                 { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 },
-                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 },
+                { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 },
                 { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 },
-                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 },
+                { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 },
                 { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 },
-                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 },
                 { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json
index 1390b98d1c2..9978f4dd556 100644
--- a/keyboards/clickety_split/leeloo/info.json
+++ b/keyboards/clickety_split/leeloo/info.json
@@ -50,13 +50,13 @@
         {"label":"TAB", "x":0, "y":1.5},
         {"label":"Q", "x":1, "y":1.4},
         {"label":"W", "x":2, "y":1.2},
-        {"label":"E", "x":3, "y":1.0},
+        {"label":"E", "x":3, "y":1},
         {"label":"R", "x":4, "y":1.2},
         {"label":"T", "x":5, "y":1.4},
 
         {"label":"Y", "x":9, "y":1.4},
         {"label":"U", "x":10, "y":1.2},
-        {"label":"I", "x":11, "y":1.0},
+        {"label":"I", "x":11, "y":1},
         {"label":"O", "x":12, "y":1.2},
         {"label":"P", "x":13, "y":1.4},
         {"label":"GRV", "x":14, "y":1.5},
@@ -64,13 +64,13 @@
         {"label":"CAPS", "x":0, "y":2.5},
         {"label":"A", "x":1, "y":2.4},
         {"label":"S", "x":2, "y":2.2},
-        {"label":"D", "x":3, "y":2.0},
+        {"label":"D", "x":3, "y":2},
         {"label":"F", "x":4, "y":2.2},
         {"label":"G", "x":5, "y":2.4},
 
         {"label":"H", "x":9, "y":2.4},
         {"label":"J", "x":10, "y":2.2},
-        {"label":"K", "x":11, "y":2.0},
+        {"label":"K", "x":11, "y":2},
         {"label":"L", "x":12, "y":2.2},
         {"label":";", "x":13, "y":2.4},
         {"label":"'", "x":14, "y":2.5},
@@ -78,7 +78,7 @@
         {"label":"Shift", "x":0, "y":3.5},
         {"label":"Z", "x":1, "y":3.4},
         {"label":"X", "x":2, "y":3.2},
-        {"label":"C", "x":3, "y":3.0},
+        {"label":"C", "x":3, "y":3},
         {"label":"V", "x":4, "y":3.2},
         {"label":"B", "x":5, "y":3.4},
         {"label":"GUI", "x":6.25, "y":3.4},
@@ -86,7 +86,7 @@
         {"label":"GUI", "x":7.75, "y":3.4},
         {"label":"N", "x":9, "y":3.4},
         {"label":"M", "x":10, "y":3.2},
-        {"label":",", "x":11, "y":3.0},
+        {"label":",", "x":11, "y":3},
         {"label":".", "x":12, "y":3.2},
         {"label":"/", "x":13, "y":3.4},
         {"label":"Shift", "x":14, "y":3.5},
diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
index 3810d5c40ee..daa2e878071 100644
--- a/keyboards/cozykeys/bloomer/v2/info.json
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -12,7 +12,7 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
         { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
         { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
         { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
@@ -26,7 +26,7 @@
         { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 },
         { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 },
         { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 },
-        { "label": "k14", "x": 15.193, "y":   0.0, "r": -10 },
+        { "label": "k14", "x": 15.193, "y":     0, "r": -10 },
         { "label": "k15", "x":  0.695, "y": 0.985, "r":  10 },
         { "label": "k16", "x":  1.679, "y": 1.158, "r":  10 },
         { "label": "k17", "x":  2.682, "y": 1.229, "r":  10 },
@@ -84,7 +84,7 @@
         { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 },
         { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 },
         { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 },
-        { "label": "k72", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k72", "x":      0, "y": 4.924, "r":  10 },
         { "label": "k73", "x":  0.985, "y": 5.098, "r":  10 },
         { "label": "k74", "x":  1.988, "y": 5.168, "r":  10 },
         { "label": "k75", "x":  3.027, "y": 5.031, "r":  10 },
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
index 0c5e01cd05e..a7ceb820c8f 100644
--- a/keyboards/cozykeys/bloomer/v3/info.json
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -12,7 +12,7 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k00", "x":  0.868, "y":     0, "r":  10 },
         { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
         { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
         { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
@@ -23,7 +23,7 @@
         { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 },
         { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 },
         { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 },
-        { "label": "k11", "x": 15.403, "y":   0.0, "r": -10 },
+        { "label": "k11", "x": 15.403, "y":     0, "r": -10 },
         { "label": "k12", "x":  0.695, "y": 0.985, "r":  10 },
         { "label": "k13", "x":  1.679, "y": 1.158, "r":  10 },
         { "label": "k14", "x":  2.682, "y": 1.229, "r":  10 },
@@ -85,7 +85,7 @@
         { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 },
         { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 },
         { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 },
-        { "label": "k73", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k73", "x":      0, "y": 4.924, "r":  10 },
         { "label": "k74", "x":  0.985, "y": 5.098, "r":  10 },
         { "label": "k75", "x":  1.988, "y": 5.168, "r":  10 },
         { "label": "k76", "x":  3.027, "y": 5.031, "r":  10 },
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
index 0e94558e177..ddeec488445 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -18,7 +18,7 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k01", "x":  0.693, "y":   0.0, "r":  10 },
+        { "label": "k01", "x":  0.693, "y":     0, "r":  10 },
         { "label": "k02", "x":  1.675, "y": 0.173, "r":  10 },
         { "label": "k03", "x":  2.685, "y": 0.191, "r":  10 },
         { "label": "k04", "x":  3.712, "y": 0.106, "r":  10 },
@@ -29,7 +29,7 @@
         { "label": "k09", "x":  9.435, "y": 0.106, "r": -10 },
         { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
         { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
-        { "label": "k12", "x": 12.454, "y":   0.0, "r": -10 },
+        { "label": "k12", "x": 12.454, "y":     0, "r": -10 },
         { "label": "k13", "x":   0.52, "y": 0.982, "r":  10 },
         { "label": "k14", "x":  1.502, "y": 1.155, "r":  10 },
         { "label": "k15", "x":  2.511, "y": 1.174, "r":  10 },
@@ -70,7 +70,7 @@
         { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
         { "label": "k51", "x": 11.992, "y":  3.12, "r": -10 },
         { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
-        { "label": "k53", "x":    0.0, "y": 3.929, "r":  10 },
+        { "label": "k53", "x":      0, "y": 3.929, "r":  10 },
         { "label": "k54", "x":  0.982, "y": 4.102, "r":  10 },
         { "label": "k55", "x":  1.992, "y":  4.12, "r":  10 },
         { "label": "k56", "x":   3.02, "y": 4.035, "r":  10 },
diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
index d4b4e36b418..9173f12edce 100644
--- a/keyboards/dailycraft/claw44/rev1/info.json
+++ b/keyboards/dailycraft/claw44/rev1/info.json
@@ -26,8 +26,8 @@
                 {"label":"L02", "x":2, "y":0.35},
                 {"label":"L03", "x":3, "y":0},
                 {"label":"L04", "x":4, "y":0.05},
-                {"label":"L05", "x":5, "y":0.10},
-                {"label":"R00", "x":11.5, "y":0.10},
+                {"label":"L05", "x":5, "y":0.1},
+                {"label":"R00", "x":11.5, "y":0.1},
                 {"label":"R01", "x":12.5, "y":0.05},
                 {"label":"R02", "x":13.5, "y":0},
                 {"label":"R03", "x":14.5, "y":0.35},
@@ -38,8 +38,8 @@
                 {"label":"L12", "x":2, "y":1.35},
                 {"label":"L13", "x":3, "y":1},
                 {"label":"L14", "x":4, "y":1.05},
-                {"label":"L15", "x":5, "y":1.10},
-                {"label":"R10", "x":11.5, "y":1.10},
+                {"label":"L15", "x":5, "y":1.1},
+                {"label":"R10", "x":11.5, "y":1.1},
                 {"label":"R11", "x":12.5, "y":1.05},
                 {"label":"R12", "x":13.5, "y":1},
                 {"label":"R13", "x":14.5, "y":1.35},
@@ -50,20 +50,20 @@
                 {"label":"L22", "x":2, "y":2.35},
                 {"label":"L23", "x":3, "y":2},
                 {"label":"L24", "x":4, "y":2.05},
-                {"label":"L25", "x":5, "y":2.10},
-                {"label":"R20", "x":11.5, "y":2.10},
+                {"label":"L25", "x":5, "y":2.1},
+                {"label":"R20", "x":11.5, "y":2.1},
                 {"label":"R21", "x":12.5, "y":2.05},
                 {"label":"R22", "x":13.5, "y":2},
                 {"label":"R23", "x":14.5, "y":2.35},
                 {"label":"R24", "x":15.5, "y":3.03},
                 {"label":"R25", "x":16.5, "y":3.18},
                 {"label":"L30", "x":4, "y":3.05},
-                {"label":"L31", "x":5, "y":3.10},
-                {"label":"L32", "x":6, "y":3.20, "w":1.25},
-                {"label":"L33", "x":7.25, "y":3.50},
-                {"label":"R30", "x":9.25, "y":3.50},
-                {"label":"R31", "x":10.25, "y":3.20, "w":1.25},
-                {"label":"R32", "x":11.5, "y":3.10},
+                {"label":"L31", "x":5, "y":3.1},
+                {"label":"L32", "x":6, "y":3.2, "w":1.25},
+                {"label":"L33", "x":7.25, "y":3.5},
+                {"label":"R30", "x":9.25, "y":3.5},
+                {"label":"R31", "x":10.25, "y":3.2, "w":1.25},
+                {"label":"R32", "x":11.5, "y":3.1},
                 {"label":"R33", "x":12.5, "y":3.05}
             ]
         }
diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index 520605c0d66..61012ae7525 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -594,7 +594,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1162,7 +1162,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1597,7 +1597,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4, "w": 1.25},
                 {"x": 11.25, "y": 4, "w": 1.25},
@@ -1742,7 +1742,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6.00, "y": 4, "w": 1.25},
+                {"x": 6, "y": 4, "w": 1.25},
                 {"x": 7.25, "y": 4, "w": 2.75},
                 {"x": 10, "y": 4},
                 {"x": 11, "y": 4},
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index 88931fc1339..d2d1935a74a 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -39,7 +39,7 @@
 
                 {"x": 6, "y": 1.5},
                 {"x": 7, "y": 1.38},
-                {"x": 8, "y": 1.0},
+                {"x": 8, "y": 1},
                 {"x": 9, "y": 1.38},
                 {"x": 10, "y": 1.88},
 
diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json
index 69a64bfa319..f4838e803c5 100644
--- a/keyboards/elephant42/info.json
+++ b/keyboards/elephant42/info.json
@@ -61,15 +61,15 @@
                 {"label":">", "x":13.5, "y":2.3},
                 {"label":"?", "x":14.5, "y":3.1},
 
-                {"label":"Alt", "x":3.5, "y":4.0},
-                {"label":"Cmd", "x":4.5, "y":4.0},
-                {"label":"Lower", "x":5.5, "y":4.0},
-                {"label":"Shift", "x":6.5, "y":4.0},
+                {"label":"Alt", "x":3.5, "y":4},
+                {"label":"Cmd", "x":4.5, "y":4},
+                {"label":"Lower", "x":5.5, "y":4},
+                {"label":"Shift", "x":6.5, "y":4},
                 
-                {"label":"Del", "x":9.25, "y":4.0},
-                {"label":"Raise", "x":10.25, "y":4.0},
-                {"label":"Enter", "x":11.25, "y":4.0},
-                {"label":"Backspace", "x":12.25, "y":4.0}
+                {"label":"Del", "x":9.25, "y":4},
+                {"label":"Raise", "x":10.25, "y":4},
+                {"label":"Enter", "x":11.25, "y":4},
+                {"label":"Backspace", "x":12.25, "y":4}
             ]
         }
     }
diff --git a/keyboards/exclusive/e6v2/le_bmc/info.json b/keyboards/exclusive/e6v2/le_bmc/info.json
index 0faeed9a493..632ad33d657 100644
--- a/keyboards/exclusive/e6v2/le_bmc/info.json
+++ b/keyboards/exclusive/e6v2/le_bmc/info.json
@@ -22,7 +22,7 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
diff --git a/keyboards/exclusive/e6v2/oe_bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
index b2eac928494..ff8404bef15 100644
--- a/keyboards/exclusive/e6v2/oe_bmc/info.json
+++ b/keyboards/exclusive/e6v2/oe_bmc/info.json
@@ -22,7 +22,7 @@
     "bootloader": "bootloadhid",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10.0, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
         },
 
         "LAYOUT_60_ansi": {
diff --git a/keyboards/fearherbs1/blue_team_pad/info.json b/keyboards/fearherbs1/blue_team_pad/info.json
index 8cefdd23b17..37de66b4777 100644
--- a/keyboards/fearherbs1/blue_team_pad/info.json
+++ b/keyboards/fearherbs1/blue_team_pad/info.json
@@ -33,28 +33,28 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [1, 2], "x": 2.0, "y": 2.0 },
-                { "matrix": [1, 3], "x": 3.0, "y": 2.0 },
-                { "matrix": [1, 4], "x": 4.0, "y": 2.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 3.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 3.0 },
-                { "matrix": [2, 2], "x": 2.0, "y": 3.0 },
-                { "matrix": [2, 3], "x": 3.0, "y": 3.0 },
-                { "matrix": [2, 4], "x": 4.0, "y": 3.0 },
-                { "matrix": [3, 0], "x": 0.0, "y": 4.0 },
-                { "matrix": [3, 1], "x": 1.0, "y": 4.0 },
-                { "matrix": [3, 2], "x": 2.0, "y": 4.0 },
-                { "matrix": [3, 3], "x": 3.0, "y": 4.0 },
-                { "matrix": [3, 4], "x": 4.0, "y": 4.0 },
-                { "matrix": [4, 0], "x": 0.0, "y": 5.0 },
-                { "matrix": [4, 1], "x": 1.0, "y": 5.0 },
-                { "matrix": [4, 2], "x": 2.0, "y": 5.0 },
-                { "matrix": [4, 3], "x": 3.0, "y": 5.0 },
-                { "matrix": [4, 4], "x": 4.0, "y": 5.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 2 },
+                { "matrix": [1, 1], "x": 1, "y": 2 },
+                { "matrix": [1, 2], "x": 2, "y": 2 },
+                { "matrix": [1, 3], "x": 3, "y": 2 },
+                { "matrix": [1, 4], "x": 4, "y": 2 },
+                { "matrix": [2, 0], "x": 0, "y": 3 },
+                { "matrix": [2, 1], "x": 1, "y": 3 },
+                { "matrix": [2, 2], "x": 2, "y": 3 },
+                { "matrix": [2, 3], "x": 3, "y": 3 },
+                { "matrix": [2, 4], "x": 4, "y": 3 },
+                { "matrix": [3, 0], "x": 0, "y": 4 },
+                { "matrix": [3, 1], "x": 1, "y": 4 },
+                { "matrix": [3, 2], "x": 2, "y": 4 },
+                { "matrix": [3, 3], "x": 3, "y": 4 },
+                { "matrix": [3, 4], "x": 4, "y": 4 },
+                { "matrix": [4, 0], "x": 0, "y": 5 },
+                { "matrix": [4, 1], "x": 1, "y": 5 },
+                { "matrix": [4, 2], "x": 2, "y": 5 },
+                { "matrix": [4, 3], "x": 3, "y": 5 },
+                { "matrix": [4, 4], "x": 4, "y": 5 }
             ]
         }
     }
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index 9c66e8655de..f639ab9b7a5 100644
--- a/keyboards/frobiac/blackbowl/info.json
+++ b/keyboards/frobiac/blackbowl/info.json
@@ -34,51 +34,51 @@
   "layouts": {
     "LAYOUT": {
        "layout": [
-                {"matrix": [5, 3], "label":"K",   "x":0,     "y":1.00},
-                {"matrix": [6, 3], "label":"U",   "x":1,     "y":0.50},
-                {"matrix": [7, 3], "label":"Q",   "x":2,     "y":0.00},
-                {"matrix": [8, 3], "label":".",   "x":3,     "y":0.00},
-                {"matrix": [9, 3], "label":"J",   "x":4,     "y":0.00},
+                {"matrix": [5, 3], "label":"K",   "x":0,     "y":1},
+                {"matrix": [6, 3], "label":"U",   "x":1,     "y":0.5},
+                {"matrix": [7, 3], "label":"Q",   "x":2,     "y":0},
+                {"matrix": [8, 3], "label":".",   "x":3,     "y":0},
+                {"matrix": [9, 3], "label":"J",   "x":4,     "y":0},
 
-                {"matrix": [0, 3], "label":"P",   "x":6,     "y":0.00},
-                {"matrix": [1, 3], "label":"C",   "x":7,     "y":0.00},
-                {"matrix": [2, 3], "label":"L",   "x":8,     "y":0.00},
-                {"matrix": [3, 3], "label":"M",   "x":9,     "y":0.50},
-                {"matrix": [4, 3], "label":"F",   "x":10,    "y":1.00},
+                {"matrix": [0, 3], "label":"P",   "x":6,     "y":0},
+                {"matrix": [1, 3], "label":"C",   "x":7,     "y":0},
+                {"matrix": [2, 3], "label":"L",   "x":8,     "y":0},
+                {"matrix": [3, 3], "label":"M",   "x":9,     "y":0.5},
+                {"matrix": [4, 3], "label":"F",   "x":10,    "y":1},
 
-                {"matrix": [5, 2], "label":"H",   "x":0,     "y":2.00},
-                {"matrix": [6, 2], "label":"I",   "x":1,     "y":1.50},
-                {"matrix": [7, 2], "label":"E",   "x":2,     "y":1.00},
-                {"matrix": [8, 2], "label":"A",   "x":3,     "y":1.00},
-                {"matrix": [9, 2], "label":"O",   "x":4,     "y":1.00},
+                {"matrix": [5, 2], "label":"H",   "x":0,     "y":2},
+                {"matrix": [6, 2], "label":"I",   "x":1,     "y":1.5},
+                {"matrix": [7, 2], "label":"E",   "x":2,     "y":1},
+                {"matrix": [8, 2], "label":"A",   "x":3,     "y":1},
+                {"matrix": [9, 2], "label":"O",   "x":4,     "y":1},
 
-                {"matrix": [0, 2], "label":"D",   "x":6,     "y":1.00},
-                {"matrix": [1, 2], "label":"T",   "x":7,     "y":1.00},
-                {"matrix": [2, 2], "label":"R",   "x":8,     "y":1.00},
-                {"matrix": [3, 2], "label":"N",   "x":9,     "y":1.50},
-                {"matrix": [4, 2], "label":"S",   "x":10,    "y":2.00},
+                {"matrix": [0, 2], "label":"D",   "x":6,     "y":1},
+                {"matrix": [1, 2], "label":"T",   "x":7,     "y":1},
+                {"matrix": [2, 2], "label":"R",   "x":8,     "y":1},
+                {"matrix": [3, 2], "label":"N",   "x":9,     "y":1.5},
+                {"matrix": [4, 2], "label":"S",   "x":10,    "y":2},
 
-                {"matrix": [5, 1], "label":"X",   "x":0,     "y":3.00},
-                {"matrix": [6, 1], "label":"Y",   "x":1,     "y":2.50},
-                {"matrix": [7, 1], "label":"-",   "x":2,     "y":2.00},
-                {"matrix": [8, 1], "label":",",   "x":3,     "y":2.00},
-                {"matrix": [9, 1], "label":"/",   "x":4,     "y":2.00},
+                {"matrix": [5, 1], "label":"X",   "x":0,     "y":3},
+                {"matrix": [6, 1], "label":"Y",   "x":1,     "y":2.5},
+                {"matrix": [7, 1], "label":"-",   "x":2,     "y":2},
+                {"matrix": [8, 1], "label":",",   "x":3,     "y":2},
+                {"matrix": [9, 1], "label":"/",   "x":4,     "y":2},
 
-                {"matrix": [0, 1], "label":"B",   "x":6,     "y":2.00},
-                {"matrix": [1, 1], "label":"G",   "x":7,     "y":2.00},
-                {"matrix": [2, 1], "label":"W",   "x":8,     "y":2.00},
-                {"matrix": [3, 1], "label":"V",   "x":9,     "y":2.50},
-                {"matrix": [4, 1], "label":"Z",   "x":10,    "y":3.00},
+                {"matrix": [0, 1], "label":"B",   "x":6,     "y":2},
+                {"matrix": [1, 1], "label":"G",   "x":7,     "y":2},
+                {"matrix": [2, 1], "label":"W",   "x":8,     "y":2},
+                {"matrix": [3, 1], "label":"V",   "x":9,     "y":2.5},
+                {"matrix": [4, 1], "label":"Z",   "x":10,    "y":3},
 
-                {"matrix": [5, 0], "label":" ",   "x":0,     "y":0.00},
-                {"matrix": [7, 0], "label":"Gui", "x":2,     "y":3.00},
-                {"matrix": [8, 0], "label":"tab", "x":3,     "y":3.00},
-                {"matrix": [9, 0], "label":"spc", "x":4,     "y":3.00},
+                {"matrix": [5, 0], "label":" ",   "x":0,     "y":0},
+                {"matrix": [7, 0], "label":"Gui", "x":2,     "y":3},
+                {"matrix": [8, 0], "label":"tab", "x":3,     "y":3},
+                {"matrix": [9, 0], "label":"spc", "x":4,     "y":3},
 
-                {"matrix": [0, 0], "label":"L2",  "x":6,     "y":3.00},
-                {"matrix": [1, 0], "label":"Sh",  "x":7,     "y":3.00},
-                {"matrix": [2, 0], "label":"L3",  "x":8,     "y":3.00},
-                {"matrix": [4, 0], "label":"Fx",  "x":10,    "y":0.00}
+                {"matrix": [0, 0], "label":"L2",  "x":6,     "y":3},
+                {"matrix": [1, 0], "label":"Sh",  "x":7,     "y":3},
+                {"matrix": [2, 0], "label":"L3",  "x":8,     "y":3},
+                {"matrix": [4, 0], "label":"Fx",  "x":10,    "y":0}
        ]
     }
   }
diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json
index 0d998165827..10f5842fa67 100644
--- a/keyboards/frobiac/blackflat/info.json
+++ b/keyboards/frobiac/blackflat/info.json
@@ -34,51 +34,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"K",   "x":0,     "y":1.00},
-                {"matrix": [0, 1], "label":"U",   "x":1,     "y":0.50},
-                {"matrix": [0, 2], "label":"Q",   "x":2,     "y":0.00},
-                {"matrix": [0, 3], "label":".",   "x":3,     "y":0.00},
-                {"matrix": [0, 4], "label":"J",   "x":4,     "y":0.00},
+                {"matrix": [0, 0], "label":"K",   "x":0,     "y":1},
+                {"matrix": [0, 1], "label":"U",   "x":1,     "y":0.5},
+                {"matrix": [0, 2], "label":"Q",   "x":2,     "y":0},
+                {"matrix": [0, 3], "label":".",   "x":3,     "y":0},
+                {"matrix": [0, 4], "label":"J",   "x":4,     "y":0},
 
-                {"matrix": [4, 0], "label":"P",   "x":6,     "y":0.00},
-                {"matrix": [4, 1], "label":"C",   "x":7,     "y":0.00},
-                {"matrix": [4, 2], "label":"L",   "x":8,     "y":0.00},
-                {"matrix": [4, 3], "label":"M",   "x":9,     "y":0.50},
-                {"matrix": [4, 4], "label":"F",   "x":10,    "y":1.00},
+                {"matrix": [4, 0], "label":"P",   "x":6,     "y":0},
+                {"matrix": [4, 1], "label":"C",   "x":7,     "y":0},
+                {"matrix": [4, 2], "label":"L",   "x":8,     "y":0},
+                {"matrix": [4, 3], "label":"M",   "x":9,     "y":0.5},
+                {"matrix": [4, 4], "label":"F",   "x":10,    "y":1},
 
-                {"matrix": [1, 0], "label":"H",   "x":0,     "y":2.00},
-                {"matrix": [1, 1], "label":"I",   "x":1,     "y":1.50},
-                {"matrix": [1, 2], "label":"E",   "x":2,     "y":1.00},
-                {"matrix": [1, 3], "label":"A",   "x":3,     "y":1.00},
-                {"matrix": [1, 4], "label":"O",   "x":4,     "y":1.00},
+                {"matrix": [1, 0], "label":"H",   "x":0,     "y":2},
+                {"matrix": [1, 1], "label":"I",   "x":1,     "y":1.5},
+                {"matrix": [1, 2], "label":"E",   "x":2,     "y":1},
+                {"matrix": [1, 3], "label":"A",   "x":3,     "y":1},
+                {"matrix": [1, 4], "label":"O",   "x":4,     "y":1},
 
-                {"matrix": [5, 0], "label":"D",   "x":6,     "y":1.00},
-                {"matrix": [5, 1], "label":"T",   "x":7,     "y":1.00},
-                {"matrix": [5, 2], "label":"R",   "x":8,     "y":1.00},
-                {"matrix": [5, 3], "label":"N",   "x":9,     "y":1.50},
-                {"matrix": [5, 4], "label":"S",   "x":10,    "y":2.00},
+                {"matrix": [5, 0], "label":"D",   "x":6,     "y":1},
+                {"matrix": [5, 1], "label":"T",   "x":7,     "y":1},
+                {"matrix": [5, 2], "label":"R",   "x":8,     "y":1},
+                {"matrix": [5, 3], "label":"N",   "x":9,     "y":1.5},
+                {"matrix": [5, 4], "label":"S",   "x":10,    "y":2},
 
-                {"matrix": [2, 0], "label":"X",   "x":0,     "y":3.00},
-                {"matrix": [2, 1], "label":"Y",   "x":1,     "y":2.50},
-                {"matrix": [2, 2], "label":"-",   "x":2,     "y":2.00},
-                {"matrix": [2, 3], "label":",",   "x":3,     "y":2.00},
-                {"matrix": [2, 4], "label":"/",   "x":4,     "y":2.00},
+                {"matrix": [2, 0], "label":"X",   "x":0,     "y":3},
+                {"matrix": [2, 1], "label":"Y",   "x":1,     "y":2.5},
+                {"matrix": [2, 2], "label":"-",   "x":2,     "y":2},
+                {"matrix": [2, 3], "label":",",   "x":3,     "y":2},
+                {"matrix": [2, 4], "label":"/",   "x":4,     "y":2},
 
-                {"matrix": [6, 0], "label":"B",   "x":6,     "y":2.00},
-                {"matrix": [6, 1], "label":"G",   "x":7,     "y":2.00},
-                {"matrix": [6, 2], "label":"W",   "x":8,     "y":2.00},
-                {"matrix": [6, 3], "label":"V",   "x":9,     "y":2.50},
-                {"matrix": [6, 4], "label":"Z",   "x":10,    "y":3.00},
+                {"matrix": [6, 0], "label":"B",   "x":6,     "y":2},
+                {"matrix": [6, 1], "label":"G",   "x":7,     "y":2},
+                {"matrix": [6, 2], "label":"W",   "x":8,     "y":2},
+                {"matrix": [6, 3], "label":"V",   "x":9,     "y":2.5},
+                {"matrix": [6, 4], "label":"Z",   "x":10,    "y":3},
 
-                {"matrix": [3, 0], "label":"",    "x":0,     "y":0.00},
-                {"matrix": [3, 2], "label":"Gui", "x":2,     "y":3.00},
-                {"matrix": [3, 3], "label":"Tab", "x":3,     "y":3.00},
-                {"matrix": [3, 4], "label":"Spc", "x":4,     "y":3.00},
+                {"matrix": [3, 0], "label":"",    "x":0,     "y":0},
+                {"matrix": [3, 2], "label":"Gui", "x":2,     "y":3},
+                {"matrix": [3, 3], "label":"Tab", "x":3,     "y":3},
+                {"matrix": [3, 4], "label":"Spc", "x":4,     "y":3},
 
-                {"matrix": [7, 0], "label":"L2",  "x":6,     "y":3.00},
-                {"matrix": [7, 1], "label":"Sh",  "x":7,     "y":3.00},
-                {"matrix": [7, 2], "label":"L3",  "x":8,     "y":3.00},
-                {"matrix": [7, 4], "label":"Fx",  "x":10,    "y":0.00}
+                {"matrix": [7, 0], "label":"L2",  "x":6,     "y":3},
+                {"matrix": [7, 1], "label":"Sh",  "x":7,     "y":3},
+                {"matrix": [7, 2], "label":"L3",  "x":8,     "y":3},
+                {"matrix": [7, 4], "label":"Fx",  "x":10,    "y":0}
             ]
         }
     }
diff --git a/keyboards/frobiac/redtilt/info.json b/keyboards/frobiac/redtilt/info.json
index f2f5d27f357..4b2d9287758 100644
--- a/keyboards/frobiac/redtilt/info.json
+++ b/keyboards/frobiac/redtilt/info.json
@@ -34,59 +34,59 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"",    "x":0,     "y":2.00},
-                {"matrix": [0, 1], "label":"K",   "x":1,     "y":2.00},
-                {"matrix": [0, 2], "label":"U",   "x":2,     "y":1.50},
-                {"matrix": [0, 3], "label":"Q",   "x":3,     "y":1.00},
-                {"matrix": [0, 4], "label":".",   "x":4,     "y":1.00},
-                {"matrix": [0, 5], "label":"J",   "x":5,     "y":1.00},
+                {"matrix": [0, 0], "label":"",    "x":0,     "y":2},
+                {"matrix": [0, 1], "label":"K",   "x":1,     "y":2},
+                {"matrix": [0, 2], "label":"U",   "x":2,     "y":1.5},
+                {"matrix": [0, 3], "label":"Q",   "x":3,     "y":1},
+                {"matrix": [0, 4], "label":".",   "x":4,     "y":1},
+                {"matrix": [0, 5], "label":"J",   "x":5,     "y":1},
 
-                {"matrix": [4, 0], "label":"P",   "x":8,     "y":1.00},
-                {"matrix": [4, 1], "label":"C",   "x":9,     "y":1.00},
-                {"matrix": [4, 2], "label":"L",   "x":10,    "y":1.00},
-                {"matrix": [4, 3], "label":"M",   "x":11,    "y":1.50},
-                {"matrix": [4, 4], "label":"F",   "x":12,    "y":2.00},
-                {"matrix": [4, 5], "label":"",    "x":13,    "y":2.00},
+                {"matrix": [4, 0], "label":"P",   "x":8,     "y":1},
+                {"matrix": [4, 1], "label":"C",   "x":9,     "y":1},
+                {"matrix": [4, 2], "label":"L",   "x":10,    "y":1},
+                {"matrix": [4, 3], "label":"M",   "x":11,    "y":1.5},
+                {"matrix": [4, 4], "label":"F",   "x":12,    "y":2},
+                {"matrix": [4, 5], "label":"",    "x":13,    "y":2},
 
-                {"matrix": [1, 0], "label":" ",   "x":0,     "y":3.00},
-                {"matrix": [1, 1], "label":"H",   "x":1,     "y":3.00},
-                {"matrix": [1, 2], "label":"I",   "x":2,     "y":2.50},
-                {"matrix": [1, 3], "label":"E",   "x":3,     "y":2.00},
-                {"matrix": [1, 4], "label":"A",   "x":4,     "y":2.00},
-                {"matrix": [1, 5], "label":"O",   "x":5,     "y":2.00},
+                {"matrix": [1, 0], "label":" ",   "x":0,     "y":3},
+                {"matrix": [1, 1], "label":"H",   "x":1,     "y":3},
+                {"matrix": [1, 2], "label":"I",   "x":2,     "y":2.5},
+                {"matrix": [1, 3], "label":"E",   "x":3,     "y":2},
+                {"matrix": [1, 4], "label":"A",   "x":4,     "y":2},
+                {"matrix": [1, 5], "label":"O",   "x":5,     "y":2},
 
-                {"matrix": [5, 0], "label":"D",   "x":8,     "y":2.00},
-                {"matrix": [5, 1], "label":"T",   "x":9,     "y":2.00},
-                {"matrix": [5, 2], "label":"R",   "x":10,    "y":2.00},
-                {"matrix": [5, 3], "label":"N",   "x":11,    "y":2.50},
-                {"matrix": [5, 4], "label":"S",   "x":12,    "y":3.00},
-                {"matrix": [5, 5], "label":"",    "x":13,    "y":3.00},
+                {"matrix": [5, 0], "label":"D",   "x":8,     "y":2},
+                {"matrix": [5, 1], "label":"T",   "x":9,     "y":2},
+                {"matrix": [5, 2], "label":"R",   "x":10,    "y":2},
+                {"matrix": [5, 3], "label":"N",   "x":11,    "y":2.5},
+                {"matrix": [5, 4], "label":"S",   "x":12,    "y":3},
+                {"matrix": [5, 5], "label":"",    "x":13,    "y":3},
 
-                {"matrix": [2, 0], "label":"",    "x":0,     "y":4.00},
-                {"matrix": [2, 1], "label":"X",   "x":1,     "y":4.00},
-                {"matrix": [2, 2], "label":"Y",   "x":2,     "y":3.50},
-                {"matrix": [2, 3], "label":"-",   "x":3,     "y":3.00},
-                {"matrix": [2, 4], "label":",",   "x":4,     "y":3.00},
-                {"matrix": [2, 5], "label":"/",   "x":5,     "y":3.00},
+                {"matrix": [2, 0], "label":"",    "x":0,     "y":4},
+                {"matrix": [2, 1], "label":"X",   "x":1,     "y":4},
+                {"matrix": [2, 2], "label":"Y",   "x":2,     "y":3.5},
+                {"matrix": [2, 3], "label":"-",   "x":3,     "y":3},
+                {"matrix": [2, 4], "label":",",   "x":4,     "y":3},
+                {"matrix": [2, 5], "label":"/",   "x":5,     "y":3},
 
-                {"matrix": [6, 0], "label":"B",   "x":8,     "y":3.00},
-                {"matrix": [6, 1], "label":"G",   "x":9,     "y":3.00},
-                {"matrix": [6, 2], "label":"W",   "x":10,    "y":3.00},
-                {"matrix": [6, 3], "label":"V",   "x":11,    "y":3.50},
-                {"matrix": [6, 4], "label":"Z",   "x":12,    "y":4.00},
-                {"matrix": [6, 5], "label":"",    "x":13,    "y":4.00},
+                {"matrix": [6, 0], "label":"B",   "x":8,     "y":3},
+                {"matrix": [6, 1], "label":"G",   "x":9,     "y":3},
+                {"matrix": [6, 2], "label":"W",   "x":10,    "y":3},
+                {"matrix": [6, 3], "label":"V",   "x":11,    "y":3.5},
+                {"matrix": [6, 4], "label":"Z",   "x":12,    "y":4},
+                {"matrix": [6, 5], "label":"",    "x":13,    "y":4},
 
-                {"matrix": [3, 0], "label":"",    "x":0,     "y":1.00},
-                {"matrix": [3, 1], "label":"",    "x":1,     "y":1.00},
-                {"matrix": [3, 3], "label":"Gui", "x":3,     "y":4.00},
-                {"matrix": [3, 4], "label":"Tab", "x":4,     "y":4.00},
-                {"matrix": [3, 5], "label":"Spc", "x":5,     "y":4.00},
+                {"matrix": [3, 0], "label":"",    "x":0,     "y":1},
+                {"matrix": [3, 1], "label":"",    "x":1,     "y":1},
+                {"matrix": [3, 3], "label":"Gui", "x":3,     "y":4},
+                {"matrix": [3, 4], "label":"Tab", "x":4,     "y":4},
+                {"matrix": [3, 5], "label":"Spc", "x":5,     "y":4},
 
-                {"matrix": [7, 0], "label":"L2",  "x":8,     "y":4.00},
-                {"matrix": [7, 1], "label":"Sh",  "x":9,     "y":4.00},
-                {"matrix": [7, 2], "label":"L3",  "x":10,    "y":4.00},
-                {"matrix": [7, 4], "label":"Fx",  "x":12,    "y":1.00},
-                {"matrix": [7, 5], "label":"",    "x":13,    "y":1.00}
+                {"matrix": [7, 0], "label":"L2",  "x":8,     "y":4},
+                {"matrix": [7, 1], "label":"Sh",  "x":9,     "y":4},
+                {"matrix": [7, 2], "label":"L3",  "x":10,    "y":4},
+                {"matrix": [7, 4], "label":"Fx",  "x":12,    "y":1},
+                {"matrix": [7, 5], "label":"",    "x":13,    "y":1}
             ]
         }
     }
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index f38051809d6..5aadadbaedf 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -100,7 +100,7 @@
                 {
                     "label": "L13",
                     "x": 3.5,
-                    "y": 1.0
+                    "y": 1
                 },
                 {
                     "label": "L14",
@@ -137,7 +137,7 @@
                 {
                     "label": "R13",
                     "x": 15,
-                    "y": 1.0
+                    "y": 1
                 },
                 {
                     "label": "R14",
diff --git a/keyboards/gkeyboard/gpad8_2r/info.json b/keyboards/gkeyboard/gpad8_2r/info.json
index fcc900a35fc..ea548c13ba9 100644
--- a/keyboards/gkeyboard/gpad8_2r/info.json
+++ b/keyboards/gkeyboard/gpad8_2r/info.json
@@ -64,16 +64,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2.0, "y": 2.25 },
-                { "matrix": [2, 3], "x": 3.0, "y": 2.25 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "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": [2, 0], "x": 0, "y": 2.25 },
+                { "matrix": [2, 1], "x": 1, "y": 2.25 },
+                { "matrix": [2, 2], "x": 2, "y": 2.25 },
+                { "matrix": [2, 3], "x": 3, "y": 2.25 }
             ]
         }
     }
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
index 45b2dd74230..033b1f84646 100644
--- a/keyboards/gl516/a52gl/info.json
+++ b/keyboards/gl516/a52gl/info.json
@@ -61,7 +61,7 @@
                 {"label":"3,5", "x":6.05, "y":3},
                 {"label":"3,6", "x":7.5, "y":3, "w":2.25},
                 {"label":"7,1", "x":9.75, "y":3, "w":1.25},
-                {"label":"7,3", "x":12.0, "y":3},
+                {"label":"7,3", "x":12, "y":3},
                 {"label":"7,4", "x":13.25, "y":3.25},
                 {"label":"7,5", "x":14.25, "y":3.25},
                 {"label":"7,6", "x":15.25, "y":3.25}
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json
index cd5928f4d4c..8735f12f78e 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/info.json
@@ -13,8 +13,8 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label": "k11", "x": 0, "y": 0.50 },
-        { "label": "k12", "x": 1, "y": 0.30 },
+        { "label": "k11", "x": 0, "y": 0.5 },
+        { "label": "k12", "x": 1, "y": 0.3 },
         { "label": "k13", "x": 2, "y": 0.15 },
         { "label": "k14", "x": 3, "y": 0 },
         { "label": "k15", "x": 4, "y": 0.15 },
@@ -23,11 +23,11 @@
         { "label": "k18", "x": 11, "y": 0.15 },
         { "label": "k19", "x": 12, "y": 0 },
         { "label": "k1a", "x": 13, "y": 0.15 },
-        { "label": "k1b", "x": 14, "y": 0.30 },
-        { "label": "k1c", "x": 15, "y": 0.50 },
+        { "label": "k1b", "x": 14, "y": 0.3 },
+        { "label": "k1c", "x": 15, "y": 0.5 },
 
-        { "label": "k21", "x": 0, "y": 1.50 },
-        { "label": "k22", "x": 1, "y": 1.30 },
+        { "label": "k21", "x": 0, "y": 1.5 },
+        { "label": "k22", "x": 1, "y": 1.3 },
         { "label": "k23", "x": 2, "y": 1.15 },
         { "label": "k24", "x": 3, "y": 1 },
         { "label": "k25", "x": 4, "y": 1.15 },
@@ -36,11 +36,11 @@
         { "label": "k28", "x": 11, "y": 1.15 },
         { "label": "k29", "x": 12, "y": 1 },
         { "label": "k2a", "x": 13, "y": 1.15 },
-        { "label": "k2b", "x": 14, "y": 1.30 },
-        { "label": "k2c", "x": 15, "y": 1.50 },
+        { "label": "k2b", "x": 14, "y": 1.3 },
+        { "label": "k2c", "x": 15, "y": 1.5 },
 
-        { "label": "k31", "x": 0, "y": 2.50 },
-        { "label": "k32", "x": 1, "y": 2.30 },
+        { "label": "k31", "x": 0, "y": 2.5 },
+        { "label": "k32", "x": 1, "y": 2.3 },
         { "label": "k33", "x": 2, "y": 2.15 },
         { "label": "k34", "x": 3, "y": 2 },
         { "label": "k35", "x": 4, "y": 2.15 },
@@ -49,11 +49,11 @@
         { "label": "k38", "x": 11, "y": 2.15 },
         { "label": "k39", "x": 12, "y": 2 },
         { "label": "k3a", "x": 13, "y": 2.15 },
-        { "label": "k3b", "x": 14, "y": 2.30 },
-        { "label": "k3c", "x": 15, "y": 2.50 },
+        { "label": "k3b", "x": 14, "y": 2.3 },
+        { "label": "k3c", "x": 15, "y": 2.5 },
 
-        { "label": "k41", "x": 0, "y": 3.50 },
-        { "label": "k42", "x": 1, "y": 3.30 },
+        { "label": "k41", "x": 0, "y": 3.5 },
+        { "label": "k42", "x": 1, "y": 3.3 },
         { "label": "k43", "x": 2, "y": 3.15 },
         { "label": "k44", "x": 3, "y": 3 },
         { "label": "k45", "x": 4, "y": 3.15 },
@@ -62,8 +62,8 @@
         { "label": "k48", "x": 11, "y": 3.15 },
         { "label": "k49", "x": 12, "y": 3 },
         { "label": "k4a", "x": 13, "y": 3.15 },
-        { "label": "k4b", "x": 14, "y": 3.30 },
-        { "label": "k4c", "x": 15, "y": 3.50 },
+        { "label": "k4b", "x": 14, "y": 3.3 },
+        { "label": "k4c", "x": 15, "y": 3.5 },
 
         { "label": "tp1", "x": 6.5, "y": 3.15 },
         { "label": "tp2", "x": 7.5, "y": 3.15 },
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json
index 2d65522a5d4..286df2173bb 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/info.json
@@ -116,7 +116,7 @@
         {"label":"0", "x":11, "y":0},
         {"label":"-", "x":12, "y":0},
         {"label":"=", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0, "w":2.0},
+        {"label":"Backspace", "x":14, "y":0, "w":2},
 
         {"label":"Tab", "x":0, "y":1, "w":1.5},
         {"label":"Q", "x":1.5, "y":1},
@@ -170,7 +170,7 @@
         {"x":6.5, "y":4, "w":1.25},
 
         {"x":8.75, "y":4, "w":1.25},
-        {"x":10, "y":4, "w":2.0},
+        {"x":10, "y":4, "w":2},
         {"label":"Alt", "x":12, "y":4},
         {"label":"Win", "x":13, "y":4},
         {"label":"Menu", "x":14, "y":4},
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json
index 0a6fd978379..0752032899f 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/info.json
@@ -87,7 +87,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4},
                 {"label": "r5_06", "x": 11, "y": 4},
@@ -164,7 +164,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4},
                 {"label": "r5_06", "x": 11, "y": 4},
@@ -241,7 +241,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4},
                 {"label": "r5_06", "x": 11, "y": 4},
@@ -319,7 +319,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4},
                 {"label": "r5_06", "x": 11, "y": 4},
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json
index bc310cad072..20840f38260 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/info.json
@@ -32,7 +32,7 @@
         {"label":"0", "x":10, "y":0},
         {"label":"-", "x":11, "y":0},
         {"label":"=", "x":12, "y":0},
-        {"label":"Backspace", "x":13, "y":0, "w":2.0},
+        {"label":"Backspace", "x":13, "y":0, "w":2},
 
         {"label":"Tab", "x":0, "y":1, "w":1.5},
         {"label":"Q", "x":1.5, "y":1},
diff --git a/keyboards/hineybush/h87_g2/info.json b/keyboards/hineybush/h87_g2/info.json
index 2868e6cffbb..df5b3e77992 100644
--- a/keyboards/hineybush/h87_g2/info.json
+++ b/keyboards/hineybush/h87_g2/info.json
@@ -26,40 +26,40 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "label": "F1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "label": "F2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
-                { "label": "F3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
-                { "label": "F4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
-                { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
-                { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
-                { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
-                { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
-                { "label": "F9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
-                { "label": "F10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
-                { "label": "F11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
-                { "label": "F12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
-                { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "label": "Backspace", "matrix": [1, 14], "w": 2.0, "x": 13.0, "y": 1.25 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [0, 2], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [0, 3], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [0, 4], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0 },
+                { "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0 },
+                { "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0 },
+                { "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0 },
+                { "label": "F9", "matrix": [0, 9], "x": 11, "y": 0 },
+                { "label": "F10", "matrix": [0, 10], "x": 12, "y": 0 },
+                { "label": "F11", "matrix": [0, 11], "x": 13, "y": 0 },
+                { "label": "F12", "matrix": [0, 12], "x": 14, "y": 0 },
+                { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "label": "Backspace", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 },
                 { "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
                 { "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
                 { "label": "PgUp", "matrix": [2, 16], "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
                 { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
                 { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -76,7 +76,7 @@
                 { "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "label": "PgDn", "matrix": [4, 16], "x": 17.25, "y": 2.25 },
-                { "label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
                 { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
                 { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -89,7 +89,7 @@
                 { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "label": "Apos", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
+                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
                 { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
                 { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
@@ -102,11 +102,11 @@
                 { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
                 { "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+                { "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
                 { "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
-                { "matrix": [5, 6], "w": 7.0, "x": 4.0, "y": 5.25 },
-                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11.0, "y": 5.25 },
+                { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+                { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11, "y": 5.25 },
                 { "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.25 },
                 { "label": "Ctrl", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
                 { "label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json
index a7035245f0f..44ddcdcf343 100644
--- a/keyboards/idb/idb_60/info.json
+++ b/keyboards/idb/idb_60/info.json
@@ -244,7 +244,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -311,7 +311,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
@@ -451,7 +451,7 @@
                 {"label":"0)", "x":10, "y":0},
                 {"label":"-_", "x":11, "y":0},
                 {"label":"=+", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2.0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
 
                 {"label":"Tab", "x":0, "y":1, "w":1.5},
                 {"label":"Q", "x":1.5, "y":1},
diff --git a/keyboards/idyllic/tinny50_rgb/info.json b/keyboards/idyllic/tinny50_rgb/info.json
index 0f759e044b4..b99777a15f0 100644
--- a/keyboards/idyllic/tinny50_rgb/info.json
+++ b/keyboards/idyllic/tinny50_rgb/info.json
@@ -32,31 +32,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.25, "x": 0.0, "y": 2.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [0, 4], "x": 4, "y": 0 },
+                { "matrix": [0, 5], "x": 5, "y": 0 },
+                { "matrix": [0, 6], "x": 6, "y": 0 },
+                { "matrix": [0, 7], "x": 7, "y": 0 },
+                { "matrix": [0, 8], "x": 8, "y": 0 },
+                { "matrix": [0, 9], "x": 9, "y": 0 },
+                { "matrix": [0, 10], "x": 10, "y": 0 },
+                { "matrix": [0, 11], "x": 11, "y": 0 },
+                { "matrix": [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": [2, 0], "w": 1.25, "x": 0, "y": 2.25 },
                 { "matrix": [2, 1], "x": 1.25, "y": 2.25 },
                 { "matrix": [2, 2], "x": 2.25, "y": 2.25 },
                 { "matrix": [2, 3], "x": 3.25, "y": 2.25 },
@@ -67,7 +67,7 @@
                 { "matrix": [2, 8], "x": 8.25, "y": 2.25 },
                 { "matrix": [2, 9], "x": 9.25, "y": 2.25 },
                 { "matrix": [2, 11], "w": 1.75, "x": 10.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -77,8 +77,8 @@
                 { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
                 { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
                 { "matrix": [3, 10], "w": 1.25, "x": 9.75, "y": 3.25 },
-                { "matrix": [3, 11], "x": 11.0, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [3, 11], "x": 11, "y": 3.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
                 { "matrix": [4, 1], "x": 1.25, "y": 4.25 },
                 { "matrix": [4, 2], "x": 2.25, "y": 4.25 },
                 { "matrix": [4, 5], "w": 6.25, "x": 3.25, "y": 4.25 },
diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index 2d553f18372..fa57ad12db3 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -27,10 +27,10 @@
 			{"label":"F6", "x":7.3, "y":0}, 
 			{"label":"F7", "x":8.3, "y":0}, 
 			{"label":"F8", "x":9.3, "y":0}, 
-			{"label":"F9", "x":11.0, "y":0}, 
-			{"label":"F10", "x":12.0, "y":0}, 
-			{"label":"F11", "x":13.0, "y":0}, 
-			{"label":"F12", "x":14.0, "y":0}, 
+			{"label":"F9", "x":11, "y":0}, 
+			{"label":"F10", "x":12, "y":0}, 
+			{"label":"F11", "x":13, "y":0}, 
+			{"label":"F12", "x":14, "y":0}, 
 			{"label":"DELETE", "x":15.3, "y":0}, 
 			{"label":"HOME", "x":16.3, "y":0}, 
 			{"label":"PGUP", "x":17.3, "y":0}, 
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index 32969da0490..e060c4a8ff7 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -36,13 +36,13 @@
                 {"label":"F6", "x":7.333, "y":0.5},
                 {"label":"F7", "x":8.333, "y":0.5},
                 {"label":"F8", "x":9.333, "y":0.5},
-                {"label":"F9", "x":11.0, "y":0.5},
-                {"label":"F10", "x":12.0, "y":0.5},
-                {"label":"F11", "x":13.0, "y":0.5},
-                {"label":"F12", "x":14.0, "y":0.5},
+                {"label":"F9", "x":11, "y":0.5},
+                {"label":"F10", "x":12, "y":0.5},
+                {"label":"F11", "x":13, "y":0.5},
+                {"label":"F12", "x":14, "y":0.5},
                 {"label":"Delete", "x":15.5, "y":0.5},
                 {"label":"Home", "x":16.9, "y":0, "w":0.6, "h":0.5},
-                {"label":"Insert", "x":17.0, "y":0.5},
+                {"label":"Insert", "x":17, "y":0.5},
                 {"label":"End", "x":17.5, "y":0, "w":0.6, "h":0.5},
                 {"label":"PgUp", "x":18.4, "y":0, "w":0.6, "h":0.5},
                 {"label":"Mute", "x":18.5, "y":0.5},
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index 1cb5612aec8..1bd9c188dd2 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -43,7 +43,7 @@
                 {"x":15.75, "y":0.1},
                 {"x":16.75, "y":0.1},
 
-                {"x":0.2, "y":1.0},
+                {"x":0.2, "y":1},
                 {"x":1.35, "y":1.1, "w":1.5},
                 {"x":2.85, "y":1.1},
                 {"x":3.85, "y":1.1},
@@ -59,7 +59,7 @@
                 {"x":15.45, "y":1.1},
                 {"x":16.45, "y":1.1, "w":1.5},
 
-                {"x":0, "y":2.0},
+                {"x":0, "y":2},
                 {"x":1.15, "y":2.1, "w":1.75},
                 {"x":2.9, "y":2.1},
                 {"x":3.9, "y":2.1},
diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json
index 7bd8f7f36cd..02779825f15 100644
--- a/keyboards/kapl/rev1/info.json
+++ b/keyboards/kapl/rev1/info.json
@@ -54,14 +54,14 @@
               {"label":"L20", "x":0, "y":2.38},
               {"label":"L21", "x":1, "y":2.38},
               {"label":"L22", "x":2, "y":2.13},
-              {"label":"L23", "x":3, "y":2.0},
+              {"label":"L23", "x":3, "y":2},
               {"label":"L24", "x":4, "y":2.13},
               {"label":"L25", "x":5, "y":2.25},
               {"label":"L26", "x":6, "y":2.35},
               {"label":"R20", "x":8.67, "y":2.35},
               {"label":"R21", "x":9.67, "y":2.25},
               {"label":"R22", "x":10.67, "y":2.13},
-              {"label":"R23", "x":11.67, "y":2.0},
+              {"label":"R23", "x":11.67, "y":2},
               {"label":"R24", "x":12.67, "y":2.13},
               {"label":"R25", "x":13.67, "y":2.38},
               {"label":"R26", "x":14.67, "y":2.38},
@@ -69,14 +69,14 @@
               {"label":"L30", "x":0, "y":3.38},
               {"label":"L31", "x":1, "y":3.38},
               {"label":"L32", "x":2, "y":3.13},
-              {"label":"L33", "x":3, "y":3.0},
+              {"label":"L33", "x":3, "y":3},
               {"label":"L34", "x":4, "y":3.13},
               {"label":"L35", "x":5, "y":3.25},
               {"label":"L36", "x":6, "y":3.35},
               {"label":"R30", "x":8.67, "y":3.35},
               {"label":"R31", "x":9.67, "y":3.25},
               {"label":"R32", "x":10.67, "y":3.13},
-              {"label":"R33", "x":11.67, "y":3.0},
+              {"label":"R33", "x":11.67, "y":3},
               {"label":"R34", "x":12.67, "y":3.13},
               {"label":"R35", "x":13.67, "y":3.38},
               {"label":"R36", "x":14.67, "y":3.38},
@@ -84,14 +84,14 @@
               {"label":"L40", "x":0, "y":4.38},
               {"label":"L41", "x":1, "y":4.38},
               {"label":"L42", "x":2, "y":4.13},
-              {"label":"L43", "x":3, "y":4.0},
+              {"label":"L43", "x":3, "y":4},
               {"label":"L44", "x":4, "y":4.13},
               {"label":"L45", "x":5.35, "y":4.92},
               {"label":"L46", "x":6.35, "y":4.45, "h":1.5},
               {"label":"R40", "x":8.02, "y":4.45, "h":1.5},
               {"label":"R41", "x":9.02, "y":4.92},
               {"label":"R42", "x":10.67, "y":4.13},
-              {"label":"R43", "x":11.67, "y":4.0},
+              {"label":"R43", "x":11.67, "y":4},
               {"label":"R44", "x":12.67, "y":4.13},
               {"label":"R45", "x":13.67, "y":4.38},
               {"label":"R46", "x":14.67, "y":4.38}
diff --git a/keyboards/kingly_keys/ave/ortho/info.json b/keyboards/kingly_keys/ave/ortho/info.json
index 8ad45d243ba..e9cf7171e29 100644
--- a/keyboards/kingly_keys/ave/ortho/info.json
+++ b/keyboards/kingly_keys/ave/ortho/info.json
@@ -23,176 +23,176 @@
   "layouts": {
     "LAYOUT_ortho_all": {
        "layout": [
-        {"label":"k001", "x":0.00, "y":0.00},
-        {"label":"k002", "x":1.50, "y":0.00},
-        {"label":"k011", "x":10.5, "y":0.00},
-        {"label":"k012", "x":11.5, "y":0.00},
-        {"label":"k013", "x":12.5, "y":0.00},
-        {"label":"k101", "x":0.00, "y":1.50},
-        {"label":"k102", "x":1.50, "y":1.50},
-        {"label":"k103", "x":2.50, "y":1.50},
-        {"label":"k104", "x":3.50, "y":1.50},
-        {"label":"k105", "x":4.50, "y":1.50},
-        {"label":"k106", "x":5.50, "y":1.50},
-        {"label":"k107", "x":6.50, "y":1.50},
-        {"label":"k108", "x":7.50, "y":1.50},
-        {"label":"k109", "x":8.50, "y":1.50},
-        {"label":"k110", "x":9.50, "y":1.50},
-        {"label":"k111", "x":10.5, "y":1.50},
-        {"label":"k112", "x":11.5, "y":1.50},
-        {"label":"k113", "x":12.5, "y":1.50},
-        {"label":"k201", "x":0.00, "y":2.50},
-        {"label":"k202", "x":1.50, "y":2.50},
-        {"label":"k203", "x":2.50, "y":2.50},
-        {"label":"k204", "x":3.50, "y":2.50},
-        {"label":"k205", "x":4.50, "y":2.50},
-        {"label":"k206", "x":5.50, "y":2.50},
-        {"label":"k207", "x":6.50, "y":2.50},
-        {"label":"k208", "x":7.50, "y":2.50},
-        {"label":"k209", "x":8.50, "y":2.50},
-        {"label":"k210", "x":9.50, "y":2.50},
-        {"label":"k211", "x":10.5, "y":2.50},
-        {"label":"k212", "x":11.5, "y":2.50},
-        {"label":"k213", "x":12.5, "y":2.50},
-        {"label":"k301", "x":0.00, "y":3.50},
-        {"label":"k302", "x":1.50, "y":3.50},
-        {"label":"k303", "x":2.50, "y":3.50},
-        {"label":"k304", "x":3.50, "y":3.50},
-        {"label":"k305", "x":4.50, "y":3.50},
-        {"label":"k306", "x":5.50, "y":3.50},
-        {"label":"k307", "x":6.50, "y":3.50},
-        {"label":"k308", "x":7.50, "y":3.50},
-        {"label":"k309", "x":8.50, "y":3.50},
-        {"label":"k310", "x":9.50, "y":3.50},
-        {"label":"k311", "x":10.5, "y":3.50},
-        {"label":"k312", "x":11.5, "y":3.50},
-        {"label":"k313", "x":12.5, "y":3.50},
-        {"label":"k401", "x":0.00, "y":4.50},
-        {"label":"k402", "x":1.50, "y":4.50},
-        {"label":"k403", "x":2.50, "y":4.50},
-        {"label":"k404", "x":3.50, "y":4.50},
-        {"label":"k405", "x":4.50, "y":4.50},
-        {"label":"k406", "x":5.50, "y":4.50},
-        {"label":"k407", "x":6.50, "y":4.50},
-        {"label":"k408", "x":7.50, "y":4.50},
-        {"label":"k409", "x":8.50, "y":4.50},
-        {"label":"k410", "x":9.50, "y":4.50},
-        {"label":"k411", "x":10.5, "y":4.50},
-        {"label":"k412", "x":11.5, "y":4.50},
-        {"label":"k413", "x":12.5, "y":4.50}
+        {"label":"k001", "x":0, "y":0},
+        {"label":"k002", "x":1.5, "y":0},
+        {"label":"k011", "x":10.5, "y":0},
+        {"label":"k012", "x":11.5, "y":0},
+        {"label":"k013", "x":12.5, "y":0},
+        {"label":"k101", "x":0, "y":1.5},
+        {"label":"k102", "x":1.5, "y":1.5},
+        {"label":"k103", "x":2.5, "y":1.5},
+        {"label":"k104", "x":3.5, "y":1.5},
+        {"label":"k105", "x":4.5, "y":1.5},
+        {"label":"k106", "x":5.5, "y":1.5},
+        {"label":"k107", "x":6.5, "y":1.5},
+        {"label":"k108", "x":7.5, "y":1.5},
+        {"label":"k109", "x":8.5, "y":1.5},
+        {"label":"k110", "x":9.5, "y":1.5},
+        {"label":"k111", "x":10.5, "y":1.5},
+        {"label":"k112", "x":11.5, "y":1.5},
+        {"label":"k113", "x":12.5, "y":1.5},
+        {"label":"k201", "x":0, "y":2.5},
+        {"label":"k202", "x":1.5, "y":2.5},
+        {"label":"k203", "x":2.5, "y":2.5},
+        {"label":"k204", "x":3.5, "y":2.5},
+        {"label":"k205", "x":4.5, "y":2.5},
+        {"label":"k206", "x":5.5, "y":2.5},
+        {"label":"k207", "x":6.5, "y":2.5},
+        {"label":"k208", "x":7.5, "y":2.5},
+        {"label":"k209", "x":8.5, "y":2.5},
+        {"label":"k210", "x":9.5, "y":2.5},
+        {"label":"k211", "x":10.5, "y":2.5},
+        {"label":"k212", "x":11.5, "y":2.5},
+        {"label":"k213", "x":12.5, "y":2.5},
+        {"label":"k301", "x":0, "y":3.5},
+        {"label":"k302", "x":1.5, "y":3.5},
+        {"label":"k303", "x":2.5, "y":3.5},
+        {"label":"k304", "x":3.5, "y":3.5},
+        {"label":"k305", "x":4.5, "y":3.5},
+        {"label":"k306", "x":5.5, "y":3.5},
+        {"label":"k307", "x":6.5, "y":3.5},
+        {"label":"k308", "x":7.5, "y":3.5},
+        {"label":"k309", "x":8.5, "y":3.5},
+        {"label":"k310", "x":9.5, "y":3.5},
+        {"label":"k311", "x":10.5, "y":3.5},
+        {"label":"k312", "x":11.5, "y":3.5},
+        {"label":"k313", "x":12.5, "y":3.5},
+        {"label":"k401", "x":0, "y":4.5},
+        {"label":"k402", "x":1.5, "y":4.5},
+        {"label":"k403", "x":2.5, "y":4.5},
+        {"label":"k404", "x":3.5, "y":4.5},
+        {"label":"k405", "x":4.5, "y":4.5},
+        {"label":"k406", "x":5.5, "y":4.5},
+        {"label":"k407", "x":6.5, "y":4.5},
+        {"label":"k408", "x":7.5, "y":4.5},
+        {"label":"k409", "x":8.5, "y":4.5},
+        {"label":"k410", "x":9.5, "y":4.5},
+        {"label":"k411", "x":10.5, "y":4.5},
+        {"label":"k412", "x":11.5, "y":4.5},
+        {"label":"k413", "x":12.5, "y":4.5}
       ]
     },
     "LAYOUT_ortho_2x2u": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50},
-         {"label":"k203", "x":2.50, "y":2.50},
-         {"label":"k204", "x":3.50, "y":2.50},
-         {"label":"k205", "x":4.50, "y":2.50},
-         {"label":"k206", "x":5.50, "y":2.50},
-         {"label":"k207", "x":6.50, "y":2.50},
-         {"label":"k208", "x":7.50, "y":2.50},
-         {"label":"k209", "x":8.50, "y":2.50},
-         {"label":"k210", "x":9.50, "y":2.50},
-         {"label":"k211", "x":10.5, "y":2.50},
-         {"label":"k212", "x":11.5, "y":2.50},
-         {"label":"k213", "x":12.5, "y":2.50},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50},
-         {"label":"k303", "x":2.50, "y":3.50},
-         {"label":"k304", "x":3.50, "y":3.50},
-         {"label":"k305", "x":4.50, "y":3.50},
-         {"label":"k306", "x":5.50, "y":3.50},
-         {"label":"k307", "x":6.50, "y":3.50},
-         {"label":"k308", "x":7.50, "y":3.50},
-         {"label":"k309", "x":8.50, "y":3.50},
-         {"label":"k310", "x":9.50, "y":3.50},
-         {"label":"k311", "x":10.5, "y":3.50},
-         {"label":"k312", "x":11.5, "y":3.50},
-         {"label":"k313", "x":12.5, "y":3.50},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50},
-         {"label":"k403", "x":2.50, "y":4.50},
-         {"label":"k404", "x":3.50, "y":4.50},
-         {"label":"k405", "x":4.50, "y":4.50},
-         {"label":"k406", "x":5.50, "y":4.50, "w":2.00},
-         {"label":"k409", "x":7.50, "y":4.50, "w":2.00},
-         {"label":"k410", "x":9.50, "y":4.50},
-         {"label":"k411", "x":10.5, "y":4.50},
-         {"label":"k412", "x":11.5, "y":4.50},
-         {"label":"k413", "x":12.5, "y":4.50}
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5},
+         {"label":"k203", "x":2.5, "y":2.5},
+         {"label":"k204", "x":3.5, "y":2.5},
+         {"label":"k205", "x":4.5, "y":2.5},
+         {"label":"k206", "x":5.5, "y":2.5},
+         {"label":"k207", "x":6.5, "y":2.5},
+         {"label":"k208", "x":7.5, "y":2.5},
+         {"label":"k209", "x":8.5, "y":2.5},
+         {"label":"k210", "x":9.5, "y":2.5},
+         {"label":"k211", "x":10.5, "y":2.5},
+         {"label":"k212", "x":11.5, "y":2.5},
+         {"label":"k213", "x":12.5, "y":2.5},
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5},
+         {"label":"k303", "x":2.5, "y":3.5},
+         {"label":"k304", "x":3.5, "y":3.5},
+         {"label":"k305", "x":4.5, "y":3.5},
+         {"label":"k306", "x":5.5, "y":3.5},
+         {"label":"k307", "x":6.5, "y":3.5},
+         {"label":"k308", "x":7.5, "y":3.5},
+         {"label":"k309", "x":8.5, "y":3.5},
+         {"label":"k310", "x":9.5, "y":3.5},
+         {"label":"k311", "x":10.5, "y":3.5},
+         {"label":"k312", "x":11.5, "y":3.5},
+         {"label":"k313", "x":12.5, "y":3.5},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5},
+         {"label":"k403", "x":2.5, "y":4.5},
+         {"label":"k404", "x":3.5, "y":4.5},
+         {"label":"k405", "x":4.5, "y":4.5},
+         {"label":"k406", "x":5.5, "y":4.5, "w":2},
+         {"label":"k409", "x":7.5, "y":4.5, "w":2},
+         {"label":"k410", "x":9.5, "y":4.5},
+         {"label":"k411", "x":10.5, "y":4.5},
+         {"label":"k412", "x":11.5, "y":4.5},
+         {"label":"k413", "x":12.5, "y":4.5}
        ]
      },
      "LAYOUT_ortho_big_boy": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50},
-         {"label":"k203", "x":2.50, "y":2.50},
-         {"label":"k204", "x":3.50, "y":2.50},
-         {"label":"k205", "x":4.50, "y":2.50},
-         {"label":"k206", "x":5.50, "y":2.50},
-         {"label":"k207", "x":6.50, "y":2.50},
-         {"label":"k208", "x":7.50, "y":2.50},
-         {"label":"k209", "x":8.50, "y":2.50},
-         {"label":"k210", "x":9.50, "y":2.50},
-         {"label":"k211", "x":10.5, "y":2.50},
-         {"label":"k212", "x":11.5, "y":2.50},
-         {"label":"k213", "x":12.5, "y":2.50},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50},
-         {"label":"k303", "x":2.50, "y":3.50},
-         {"label":"k304", "x":3.50, "y":3.50},
-         {"label":"k305", "x":4.50, "y":3.50},
-         {"label":"k306", "x":5.50, "y":3.50},
-         {"label":"k307", "x":6.50, "y":3.50},
-         {"label":"k308", "x":7.50, "y":3.50},
-         {"label":"k309", "x":8.50, "y":3.50},
-         {"label":"k310", "x":9.50, "y":3.50},
-         {"label":"k311", "x":10.5, "y":3.50},
-         {"label":"k312", "x":11.5, "y":3.50},
-         {"label":"k313", "x":12.5, "y":3.50},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50},
-         {"label":"k403", "x":2.50, "y":4.50, "w":1.50},
-         {"label":"k404", "x":4.00, "y":4.50, "w":7.00},
-         {"label":"k405", "x":11.0, "y":4.50, "w":1.50},
-         {"label":"k413", "x":12.5, "y":4.50}
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5},
+         {"label":"k203", "x":2.5, "y":2.5},
+         {"label":"k204", "x":3.5, "y":2.5},
+         {"label":"k205", "x":4.5, "y":2.5},
+         {"label":"k206", "x":5.5, "y":2.5},
+         {"label":"k207", "x":6.5, "y":2.5},
+         {"label":"k208", "x":7.5, "y":2.5},
+         {"label":"k209", "x":8.5, "y":2.5},
+         {"label":"k210", "x":9.5, "y":2.5},
+         {"label":"k211", "x":10.5, "y":2.5},
+         {"label":"k212", "x":11.5, "y":2.5},
+         {"label":"k213", "x":12.5, "y":2.5},
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5},
+         {"label":"k303", "x":2.5, "y":3.5},
+         {"label":"k304", "x":3.5, "y":3.5},
+         {"label":"k305", "x":4.5, "y":3.5},
+         {"label":"k306", "x":5.5, "y":3.5},
+         {"label":"k307", "x":6.5, "y":3.5},
+         {"label":"k308", "x":7.5, "y":3.5},
+         {"label":"k309", "x":8.5, "y":3.5},
+         {"label":"k310", "x":9.5, "y":3.5},
+         {"label":"k311", "x":10.5, "y":3.5},
+         {"label":"k312", "x":11.5, "y":3.5},
+         {"label":"k313", "x":12.5, "y":3.5},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5},
+         {"label":"k403", "x":2.5, "y":4.5, "w":1.5},
+         {"label":"k404", "x":4, "y":4.5, "w":7},
+         {"label":"k405", "x":11, "y":4.5, "w":1.5},
+         {"label":"k413", "x":12.5, "y":4.5}
        ]
      }
    }
diff --git a/keyboards/kingly_keys/ave/staggered/info.json b/keyboards/kingly_keys/ave/staggered/info.json
index 235228deb22..4b2c92fd86f 100644
--- a/keyboards/kingly_keys/ave/staggered/info.json
+++ b/keyboards/kingly_keys/ave/staggered/info.json
@@ -23,110 +23,110 @@
   "layouts": {
      "LAYOUT_staggered": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
-         {"label":"k203", "x":2.75, "y":2.50},
-         {"label":"k204", "x":3.75, "y":2.50},
-         {"label":"k205", "x":4.75, "y":2.50},
-         {"label":"k206", "x":5.75, "y":2.50},
-         {"label":"k207", "x":6.75, "y":2.50},
-         {"label":"k208", "x":7.75, "y":2.50},
-         {"label":"k209", "x":8.75, "y":2.50},
-         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.5},
+         {"label":"k204", "x":3.75, "y":2.5},
+         {"label":"k205", "x":4.75, "y":2.5},
+         {"label":"k206", "x":5.75, "y":2.5},
+         {"label":"k207", "x":6.75, "y":2.5},
+         {"label":"k208", "x":7.75, "y":2.5},
+         {"label":"k209", "x":8.75, "y":2.5},
+         {"label":"k210", "x":9.75, "y":2.5},
          {"label":"k211", "x":10.75, "y":2.5},
          {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
-         {"label":"k303", "x":3.25, "y":3.50},
-         {"label":"k304", "x":4.25, "y":3.50},
-         {"label":"k305", "x":5.25, "y":3.50},
-         {"label":"k306", "x":6.25, "y":3.50},
-         {"label":"k307", "x":7.25, "y":3.50},
-         {"label":"k308", "x":8.25, "y":3.50},
-         {"label":"k309", "x":9.25, "y":3.50},
-         {"label":"k310", "x":10.25, "y":3.50},
-         {"label":"k312", "x":11.25, "y":3.50},
-         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
-         {"label":"k403", "x":2.75, "y":4.50},
-         {"label":"k404", "x":3.75, "y":4.50, "w":1.25},
-         {"label":"k406", "x":5.00, "y":4.50, "w":2.75},
-         {"label":"k408", "x":7.75, "y":4.50, "w":2.25},
-         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
-         {"label":"k412", "x":11.25, "y":4.50},
-         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.5},
+         {"label":"k304", "x":4.25, "y":3.5},
+         {"label":"k305", "x":5.25, "y":3.5},
+         {"label":"k306", "x":6.25, "y":3.5},
+         {"label":"k307", "x":7.25, "y":3.5},
+         {"label":"k308", "x":8.25, "y":3.5},
+         {"label":"k309", "x":9.25, "y":3.5},
+         {"label":"k310", "x":10.25, "y":3.5},
+         {"label":"k312", "x":11.25, "y":3.5},
+         {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.5},
+         {"label":"k404", "x":3.75, "y":4.5, "w":1.25},
+         {"label":"k406", "x":5, "y":4.5, "w":2.75},
+         {"label":"k408", "x":7.75, "y":4.5, "w":2.25},
+         {"label":"k411", "x":10, "y":4.5, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.5},
+         {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
        ]
      },
      "LAYOUT_staggered_big_boy": {
         "layout": [
-         {"label":"k001", "x":0.00, "y":0.00},
-         {"label":"k002", "x":1.50, "y":0.00},
-         {"label":"k011", "x":10.5, "y":0.00},
-         {"label":"k012", "x":11.5, "y":0.00},
-         {"label":"k013", "x":12.5, "y":0.00},
-         {"label":"k101", "x":0.00, "y":1.50},
-         {"label":"k102", "x":1.50, "y":1.50},
-         {"label":"k103", "x":2.50, "y":1.50},
-         {"label":"k104", "x":3.50, "y":1.50},
-         {"label":"k105", "x":4.50, "y":1.50},
-         {"label":"k106", "x":5.50, "y":1.50},
-         {"label":"k107", "x":6.50, "y":1.50},
-         {"label":"k108", "x":7.50, "y":1.50},
-         {"label":"k109", "x":8.50, "y":1.50},
-         {"label":"k110", "x":9.50, "y":1.50},
-         {"label":"k111", "x":10.5, "y":1.50},
-         {"label":"k112", "x":11.5, "y":1.50},
-         {"label":"k113", "x":12.5, "y":1.50},
-         {"label":"k201", "x":0.00, "y":2.50},
-         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
-         {"label":"k203", "x":2.75, "y":2.50},
-         {"label":"k204", "x":3.75, "y":2.50},
-         {"label":"k205", "x":4.75, "y":2.50},
-         {"label":"k206", "x":5.75, "y":2.50},
-         {"label":"k207", "x":6.75, "y":2.50},
-         {"label":"k208", "x":7.75, "y":2.50},
-         {"label":"k209", "x":8.75, "y":2.50},
-         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k001", "x":0, "y":0},
+         {"label":"k002", "x":1.5, "y":0},
+         {"label":"k011", "x":10.5, "y":0},
+         {"label":"k012", "x":11.5, "y":0},
+         {"label":"k013", "x":12.5, "y":0},
+         {"label":"k101", "x":0, "y":1.5},
+         {"label":"k102", "x":1.5, "y":1.5},
+         {"label":"k103", "x":2.5, "y":1.5},
+         {"label":"k104", "x":3.5, "y":1.5},
+         {"label":"k105", "x":4.5, "y":1.5},
+         {"label":"k106", "x":5.5, "y":1.5},
+         {"label":"k107", "x":6.5, "y":1.5},
+         {"label":"k108", "x":7.5, "y":1.5},
+         {"label":"k109", "x":8.5, "y":1.5},
+         {"label":"k110", "x":9.5, "y":1.5},
+         {"label":"k111", "x":10.5, "y":1.5},
+         {"label":"k112", "x":11.5, "y":1.5},
+         {"label":"k113", "x":12.5, "y":1.5},
+         {"label":"k201", "x":0, "y":2.5},
+         {"label":"k202", "x":1.5, "y":2.5, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.5},
+         {"label":"k204", "x":3.75, "y":2.5},
+         {"label":"k205", "x":4.75, "y":2.5},
+         {"label":"k206", "x":5.75, "y":2.5},
+         {"label":"k207", "x":6.75, "y":2.5},
+         {"label":"k208", "x":7.75, "y":2.5},
+         {"label":"k209", "x":8.75, "y":2.5},
+         {"label":"k210", "x":9.75, "y":2.5},
          {"label":"k211", "x":10.75, "y":2.5},
          {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
-         {"label":"k301", "x":0.00, "y":3.50},
-         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
-         {"label":"k303", "x":3.25, "y":3.50},
-         {"label":"k304", "x":4.25, "y":3.50},
-         {"label":"k305", "x":5.25, "y":3.50},
-         {"label":"k306", "x":6.25, "y":3.50},
-         {"label":"k307", "x":7.25, "y":3.50},
-         {"label":"k308", "x":8.25, "y":3.50},
-         {"label":"k309", "x":9.25, "y":3.50},
-         {"label":"k310", "x":10.25, "y":3.50},
-         {"label":"k312", "x":11.25, "y":3.50},
-         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
-         {"label":"k401", "x":0.00, "y":4.50},
-         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
-         {"label":"k403", "x":2.75, "y":4.50},
-         {"label":"k406", "x":3.75, "y":4.50, "w":6.25},
-         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
-         {"label":"k412", "x":11.25, "y":4.50},
-         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+         {"label":"k301", "x":0, "y":3.5},
+         {"label":"k302", "x":1.5, "y":3.5, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.5},
+         {"label":"k304", "x":4.25, "y":3.5},
+         {"label":"k305", "x":5.25, "y":3.5},
+         {"label":"k306", "x":6.25, "y":3.5},
+         {"label":"k307", "x":7.25, "y":3.5},
+         {"label":"k308", "x":8.25, "y":3.5},
+         {"label":"k309", "x":9.25, "y":3.5},
+         {"label":"k310", "x":10.25, "y":3.5},
+         {"label":"k312", "x":11.25, "y":3.5},
+         {"label":"k313", "x":12.25, "y":3.5, "w":1.25},
+         {"label":"k401", "x":0, "y":4.5},
+         {"label":"k402", "x":1.5, "y":4.5, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.5},
+         {"label":"k406", "x":3.75, "y":4.5, "w":6.25},
+         {"label":"k411", "x":10, "y":4.5, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.5},
+         {"label":"k413", "x":12.25, "y":4.5, "w":1.25}
        ]
     }
   }
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index cd8953c0d73..db9b9791e9e 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -32,7 +32,7 @@
         { "label": ")", "x": 10, "y": 0 },
         { "label": "_", "x": 11, "y": 0 },
         { "label": "+", "x": 12, "y": 0 },
-        { "label": "|", "x": 13, "y": 0 , "w": 2.0},
+        { "label": "|", "x": 13, "y": 0 , "w": 2},
         { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
         { "label": "Q", "x": 1.5, "y": 1 },
         { "label": "W", "x": 2.5, "y": 1 },
@@ -60,20 +60,20 @@
         { "label": ":", "x": 10.75, "y": 2 },
         { "label": "\"", "x": 11.75, "y": 2 },
         { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 3, "w": 2.0 },
-        { "label": "Z", "x": 2.0, "y": 3 },
-        { "label": "X", "x": 3.0, "y": 3 },
-        { "label": "C", "x": 4.0, "y": 3 },
-        { "label": "V", "x": 5.0, "y": 3 },
-        { "label": "B", "x": 6.0, "y": 3 },
-        { "label": "N", "x": 7.0, "y": 3 },
-        { "label": "M", "x": 8.0, "y": 3 },
-        { "label": "<", "x": 9.0, "y": 3 },
-        { "label": ">", "x": 10.0, "y": 3 },
-        { "label": "?", "x": 11.0, "y": 3 },
-        { "label": "Shift", "x": 12.0, "y": 3, "w": 1.0 },
-		{ "label": "Shift", "x": 13.0, "y": 3, "w": 1.0 },
-	    { "label": "Fn", "x": 14.0, "y": 3, "w": 1.0 },
+        { "label": "Shift", "x": 0, "y": 3, "w": 2 },
+        { "label": "Z", "x": 2, "y": 3 },
+        { "label": "X", "x": 3, "y": 3 },
+        { "label": "C", "x": 4, "y": 3 },
+        { "label": "V", "x": 5, "y": 3 },
+        { "label": "B", "x": 6, "y": 3 },
+        { "label": "N", "x": 7, "y": 3 },
+        { "label": "M", "x": 8, "y": 3 },
+        { "label": "<", "x": 9, "y": 3 },
+        { "label": ">", "x": 10, "y": 3 },
+        { "label": "?", "x": 11, "y": 3 },
+        { "label": "Shift", "x": 12, "y": 3, "w": 1 },
+		{ "label": "Shift", "x": 13, "y": 3, "w": 1 },
+	    { "label": "Fn", "x": 14, "y": 3, "w": 1 },
         { "label": "L", "x": 1.25, "y": 4 , "w": 1.25},
         { "label": "L", "x": 2.5, "y": 4, "w": 1.25 },
         { "x": 3.75, "y": 4, "w": 6.25 },
diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json
index 80ec07ceb2f..8327b8a853e 100644
--- a/keyboards/lazydesigners/dimpleplus/info.json
+++ b/keyboards/lazydesigners/dimpleplus/info.json
@@ -90,7 +90,7 @@
                 {"label":"K007 (B3,B5)", "x":7.5, "y":0},
                 {"label":"K008 (B3,B4)", "x":8.5, "y":0},
                 {"label":"K009 (B3,D7)", "x":9.5, "y":0},
-                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2.0},
+                {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2},
                 {"label":"K100 (F0,F1)", "x":0, "y":1.25},
                 {"label":"K101 (F0,D5)", "x":1, "y":1.25},
                 {"label":"K102 (F0,F6)", "x":2, "y":1.25},
@@ -127,7 +127,7 @@
                 {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
                 {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
                 {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
-                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7.00},
+                {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7},
                 {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
                 {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
             ]
diff --git a/keyboards/mecxlabs/mp1/info.json b/keyboards/mecxlabs/mp1/info.json
index db989e5517f..4ab194f8839 100644
--- a/keyboards/mecxlabs/mp1/info.json
+++ b/keyboards/mecxlabs/mp1/info.json
@@ -31,15 +31,15 @@
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
-                { "matrix": [2, 2], "x": 2.0, "y": 2.0 }
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 }
             ]
         }
     }
diff --git a/keyboards/melgeek/mach80/info.json b/keyboards/melgeek/mach80/info.json
index c3ac841283e..b0a9cf2a0dd 100755
--- a/keyboards/melgeek/mach80/info.json
+++ b/keyboards/melgeek/mach80/info.json
@@ -45,7 +45,7 @@
                 {"x": 10, "y": 1.5},
                 {"x": 11, "y": 1.5},
                 {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 13, "y": 1.5, "w": 2},
                 {"x": 15.25, "y": 1.5},
                 {"x": 16.25, "y": 1.5},
                 {"x": 17.25, "y": 1.5},
@@ -141,7 +141,7 @@
                 {"x": 10, "y": 1.5},
                 {"x": 11, "y": 1.5},
                 {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.5, "w": 2.0},
+                {"x": 13, "y": 1.5, "w": 2},
                 {"x": 15.25, "y": 1.5},
                 {"x": 16.25, "y": 1.5},
                 {"x": 17.25, "y": 1.5},
diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/info.json
index 033da3766cd..c09bb93f6b9 100755
--- a/keyboards/melgeek/mojo68/info.json
+++ b/keyboards/melgeek/mojo68/info.json
@@ -33,7 +33,7 @@
 				{"x":10, "y":0},
 				{"x":11, "y":0},
 				{"x":12, "y":0},
-				{"x":13, "y":0, "w":2.0},
+				{"x":13, "y":0, "w":2},
 				{"x":15, "y":0},
 
 				{"x":0, "y":1, "w":1.5},
diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json
index b3792ca9b35..b0626ee421a 100644
--- a/keyboards/melgeek/tegic/info.json
+++ b/keyboards/melgeek/tegic/info.json
@@ -51,7 +51,7 @@
                 {"x": 10,	"y": 1.5},
                 {"x": 11,	"y": 1.5},
                 {"x": 12,	"y": 1.5},
-                {"x": 13,	"y": 1.5, "w": 2.0},
+                {"x": 13,	"y": 1.5, "w": 2},
                 {"x": 15.5, "y": 1.5},
 
                 {"x": 0,	"y": 2.5, "w": 1.5},
diff --git a/keyboards/mini_elixivy/info.json b/keyboards/mini_elixivy/info.json
index de5220f1c92..3c0176def9e 100644
--- a/keyboards/mini_elixivy/info.json
+++ b/keyboards/mini_elixivy/info.json
@@ -24,20 +24,20 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout":[
-                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2.00},{"label":"Mute", "x":15, "y":0},
+                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2},{"label":"Mute", "x":15, "y":0},
                 {"label":"Tab", "x":0, "y":1, "w":1.5},{"label":"Q", "x":1.5, "y":1},{"label":"W", "x":2.5, "y":1},{"label":"E", "x":3.5, "y":1},{"label":"R", "x":4.5, "y":1},{"label":"T", "x":5.5, "y":1},{"label":"Y", "x":6.5, "y":1},{"label":"U", "x":7.5, "y":1},{"label":"I", "x":8.5, "y":1},{"label":"O", "x":9.5, "y":1},{"label":"P", "x":10.5, "y":1},{"label":"[", "x":11.5, "y":1},{"label":"]", "x":12.5, "y":1},{"label":"BackSlash", "x":13.5, "y":1, "w":1.5},{"label":"PrintScr", "x":15, "y":1},
                 {"label":"Caps", "x":0, "y":2, "w":1.75},{"label":"A", "x":1.75, "y":2},{"label":"S", "x":2.75, "y":2},{"label":"D", "x":3.75, "y":2},{"label":"F", "x":4.75, "y":2},{"label":"G", "x":5.75, "y":2},{"label":"H", "x":6.75, "y":2},{"label":"J", "x":7.75, "y":2},{"label":"K", "x":8.75, "y":2},{"label":"L", "x":9.75, "y":2},{"label":";", "x":10.75, "y":2},{"label":"'", "x":11.75, "y":2},{"label":"Enter", "x":12.75, "y":2, "w":2.25},{"label":"Del", "x":15, "y":2},
                 {"label":"Shift", "x":0, "y":3, "w":2.25},{"label":"Z", "x":2.25, "y":3},{"label":"X", "x":3.25, "y":3},{"label":"C", "x":4.25, "y":3},{"label":"V", "x":5.25, "y":3},{"label":"B", "x":6.25, "y":3},{"label":"N", "x":7.25, "y":3},{"label":"M", "x":8.25, "y":3},{"label":",", "x":9.25, "y":3},{"label":".", "x":10.25, "y":3},{"label":"/", "x":11.25, "y":3},{"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Up", "x":14, "y":3},{"label":"`", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.50, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.5, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout":[
-                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2.00},{"label":"Mute", "x":15, "y":0},
+                {"label":"Esc", "x":0, "y":0},{"label":"1", "x":1, "y":0},{"label":"2", "x":2, "y":0},{"label":"3", "x":3, "y":0},{"label":"4", "x":4, "y":0},{"label":"5", "x":5, "y":0},{"label":"6", "x":6, "y":0},{"label":"7", "x":7, "y":0},{"label":"8", "x":8, "y":0},{"label":"9", "x":9, "y":0},{"label":"0", "x":10, "y":0},{"label":"Dash", "x":11, "y":0},{"label":"Equals", "x":12, "y":0},{"label":"Backspace", "x":13, "y":0, "w":2},{"label":"Mute", "x":15, "y":0},
                 {"label":"Tab", "x":0, "y":1, "w":1.5},{"label":"Q", "x":1.5, "y":1},{"label":"W", "x":2.5, "y":1},{"label":"E", "x":3.5, "y":1},{"label":"R", "x":4.5, "y":1},{"label":"T", "x":5.5, "y":1},{"label":"Y", "x":6.5, "y":1},{"label":"U", "x":7.5, "y":1},{"label":"I", "x":8.5, "y":1},{"label":"O", "x":9.5, "y":1},{"label":"P", "x":10.5, "y":1},{"label":"[", "x":11.5, "y":1},{"label":"]", "x":12.5, "y":1},{"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},{"label":"PrintScr", "x":15, "y":1},
                 {"label":"Caps", "x":0, "y":2, "w":1.75},{"label":"A", "x":1.75, "y":2},{"label":"S", "x":2.75, "y":2},{"label":"D", "x":3.75, "y":2},{"label":"F", "x":4.75, "y":2},{"label":"G", "x":5.75, "y":2},{"label":"H", "x":6.75, "y":2},{"label":"J", "x":7.75, "y":2},{"label":"K", "x":8.75, "y":2},{"label":"L", "x":9.75, "y":2},{"label":";", "x":10.75, "y":2},{"label":"'", "x":11.75, "y":2},{"label":"BackSlash", "x":12.75, "y":2},{"label":"Del", "x":15, "y":2},
                 {"label":"Shift", "x":0, "y":3, "w":1.25},{"label":"BackSlash", "x":1.25, "y":3},{"label":"Z", "x":2.25, "y":3},{"label":"X", "x":3.25, "y":3},{"label":"C", "x":4.25, "y":3},{"label":"V", "x":5.25, "y":3},{"label":"B", "x":6.25, "y":3},{"label":"N", "x":7.25, "y":3},{"label":"M", "x":8.25, "y":3},{"label":",", "x":9.25, "y":3},{"label":".", "x":10.25, "y":3},{"label":"/", "x":11.25, "y":3},{"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Up", "x":14, "y":3},{"label":"`", "x":15, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.50, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}              
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},{"label":"Win", "x":1.25, "y":4, "w":1.25},{"label":"Alt", "x":2.5, "y":4, "w":1.25},{"label":"", "x":3.75, "y":4, "w":6.25},{"label":"Alt", "x":10, "y":4},{"label":"Fn", "x":11, "y":4},{"label":"Ctrl", "x":12, "y":4},{"label":"Left", "x":13, "y":4},{"label":"Down", "x":14, "y":4},{"label":"Right", "x":15, "y":4}              
             ]
         }
     }
diff --git a/keyboards/mkh_studio/bully/info.json b/keyboards/mkh_studio/bully/info.json
index 3615b4893f2..a2187ba9e4c 100644
--- a/keyboards/mkh_studio/bully/info.json
+++ b/keyboards/mkh_studio/bully/info.json
@@ -23,52 +23,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "w": 1.5, "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.5, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
-                { "matrix": [3, 11], "x": 12.5, "y": 0.0 },
-                { "matrix": [1, 0], "w": 1.75, "x": 0.0, "y": 1.0 },
-                { "matrix": [1, 1], "x": 1.75, "y": 1.0 },
-                { "matrix": [1, 2], "x": 2.75, "y": 1.0 },
-                { "matrix": [1, 3], "x": 3.75, "y": 1.0 },
-                { "matrix": [1, 4], "x": 4.75, "y": 1.0 },
-                { "matrix": [1, 5], "x": 5.75, "y": 1.0 },
-                { "matrix": [1, 6], "x": 6.75, "y": 1.0 },
-                { "matrix": [1, 7], "x": 7.75, "y": 1.0 },
-                { "matrix": [1, 8], "x": 8.75, "y": 1.0 },
-                { "matrix": [1, 9], "x": 9.75, "y": 1.0 },
-                { "matrix": [1, 10], "x": 10.75, "y": 1.0 },
-                { "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1.0 },
-                { "matrix": [2, 0], "w": 2.25, "x": 0.0, "y": 2.0 },
-                { "matrix": [2, 1], "x": 2.25, "y": 2.0 },
-                { "matrix": [2, 2], "x": 3.25, "y": 2.0 },
-                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
-                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
-                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
-                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
-                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
-                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
-                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
-                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
-                { "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2.0 },
-                { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
-                { "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3.0 },
-                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
-                { "matrix": [3, 3], "w": 3, "x": 3.75, "y": 3.0, "h": 0.5 },
+                { "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.5, "y": 0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0 },
+                { "matrix": [3, 11], "x": 12.5, "y": 0 },
+                { "matrix": [1, 0], "w": 1.75, "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1.75, "y": 1 },
+                { "matrix": [1, 2], "x": 2.75, "y": 1 },
+                { "matrix": [1, 3], "x": 3.75, "y": 1 },
+                { "matrix": [1, 4], "x": 4.75, "y": 1 },
+                { "matrix": [1, 5], "x": 5.75, "y": 1 },
+                { "matrix": [1, 6], "x": 6.75, "y": 1 },
+                { "matrix": [1, 7], "x": 7.75, "y": 1 },
+                { "matrix": [1, 8], "x": 8.75, "y": 1 },
+                { "matrix": [1, 9], "x": 9.75, "y": 1 },
+                { "matrix": [1, 10], "x": 10.75, "y": 1 },
+                { "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1 },
+                { "matrix": [2, 0], "w": 2.25, "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 2.25, "y": 2 },
+                { "matrix": [2, 2], "x": 3.25, "y": 2 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2 },
+                { "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2 },
+                { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+                { "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 },
+                { "matrix": [3, 3], "w": 3, "x": 3.75, "y": 3, "h": 0.5 },
                 { "matrix": [3, 5], "w": 6, "x": 3.75, "y": 3.5, "h": 0.5 },
-                { "matrix": [3, 6], "w": 3, "x": 6.75, "y": 3.0, "h": 0.5 },
-                { "matrix": [3, 8], "w": 1.25, "x": 9.75, "y": 3.0 },
-                { "matrix": [3, 9], "w": 1.25, "x": 11, "y": 3.0 },
-                { "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3.0 }
+                { "matrix": [3, 6], "w": 3, "x": 6.75, "y": 3, "h": 0.5 },
+                { "matrix": [3, 8], "w": 1.25, "x": 9.75, "y": 3 },
+                { "matrix": [3, 9], "w": 1.25, "x": 11, "y": 3 },
+                { "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3 }
             ]
         }
     }    
diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json
index 4059817b743..1c9eaef3a19 100644
--- a/keyboards/murcielago/info.json
+++ b/keyboards/murcielago/info.json
@@ -42,50 +42,50 @@
         {"label":"0,0", "x":0, "y":0.425},
         {"label":"0,1", "x":1, "y":0.25},
         {"label":"0,2", "x":2, "y":0.125},
-        {"label":"0,3", "x":3, "y":0.0},
+        {"label":"0,3", "x":3, "y":0},
         {"label":"0,4", "x":4, "y":0.125},
         {"label":"0,5", "x":5, "y":0.25},
         {"label":"6,0", "x":9, "y":0.25},
         {"label":"6,1", "x":10, "y":0.125},
-        {"label":"6,2", "x":11, "y":0.0},
+        {"label":"6,2", "x":11, "y":0},
         {"label":"6,3", "x":12, "y":0.125},
         {"label":"6,4", "x":13, "y":0.25},
         {"label":"6,5", "x":14, "y":0.425},
         {"label":"1,0", "x":0, "y":1.425},
         {"label":"1,1", "x":1, "y":1.25},
         {"label":"1,2", "x":2, "y":1.125},
-        {"label":"1,3", "x":3, "y":1.0},
+        {"label":"1,3", "x":3, "y":1},
         {"label":"1,4", "x":4, "y":1.125},
         {"label":"1,5", "x":5, "y":1.25},
         {"label":"7,0", "x":9, "y":1.25},
         {"label":"7,1", "x":10, "y":1.125},
-        {"label":"7,2", "x":11, "y":1.0},
+        {"label":"7,2", "x":11, "y":1},
         {"label":"7,3", "x":12, "y":1.125},
         {"label":"7,4", "x":13, "y":1.25},
         {"label":"7,5", "x":14, "y":1.425},
         {"label":"2,0", "x":0, "y":2.425},
         {"label":"2,1", "x":1, "y":2.25},
         {"label":"2,2", "x":2, "y":2.125},
-        {"label":"2,3", "x":3, "y":2.0},
+        {"label":"2,3", "x":3, "y":2},
         {"label":"2,4", "x":4, "y":2.125},
         {"label":"2,5", "x":5, "y":2.25},
         {"label":"8,0", "x":9, "y":2.25},
         {"label":"8,1", "x":10, "y":2.125},
-        {"label":"8,2", "x":11, "y":2.0},
+        {"label":"8,2", "x":11, "y":2},
         {"label":"8,3", "x":12, "y":2.125},
         {"label":"8,4", "x":13, "y":2.25},
         {"label":"8,5", "x":14, "y":2.425},
         {"label":"3,0", "x":0, "y":3.425},
         {"label":"3,1", "x":1, "y":3.25},
         {"label":"3,2", "x":2, "y":3.125},
-        {"label":"3,3", "x":3, "y":3.0},
+        {"label":"3,3", "x":3, "y":3},
         {"label":"3,4", "x":4, "y":3.125},
         {"label":"3,5", "x":5, "y":3.25},
         {"label":"5,5", "x":6, "y":3.25},
         {"label":"11,0", "x":8, "y":3.25},
         {"label":"9,0", "x":9, "y":3.25},
         {"label":"9,1", "x":10, "y":3.125},
-        {"label":"9,2", "x":11, "y":3.0},
+        {"label":"9,2", "x":11, "y":3},
         {"label":"9,3", "x":12, "y":3.125},
         {"label":"9,4", "x":13, "y":3.25},
         {"label":"9,5", "x":14, "y":3.425},
diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
index ff6b097b3c0..d02329aad72 100644
--- a/keyboards/neito/info.json
+++ b/keyboards/neito/info.json
@@ -77,7 +77,7 @@
                 {"label":"4,5", "x":14.94, "y":2.25},
                 {"label":"5,5", "x":15.94, "y":2.25},
                 {"label":"4,6", "x":16.94, "y":2.25},
-                {"label":"4,7", "x":19.69, "y":2.0},
+                {"label":"4,7", "x":19.69, "y":2},
 
                 {"label":"6,0", "x":0, "y":3.25, "w":1.25},
                 {"label":"8,0", "x":1.25, "y":3.25},
diff --git a/keyboards/pierce/info.json b/keyboards/pierce/info.json
index b2dd54c57e3..1f11badbfce 100644
--- a/keyboards/pierce/info.json
+++ b/keyboards/pierce/info.json
@@ -16,34 +16,34 @@
             "layout": [
                 {"x":0, "y":0.5},
                 {"x":1, "y":0.13},
-                {"x":2, "y":0.0},
+                {"x":2, "y":0},
                 {"x":3, "y":0.13},
                 {"x":4, "y":0.25},
                 {"x":7, "y":0.25},
                 {"x":8, "y":0.13},
-                {"x":9, "y":0.0},
+                {"x":9, "y":0},
                 {"x":10, "y":0.13},
                 {"x":11, "y":0.5},
 
                 {"x":0, "y":1.5},
                 {"x":1, "y":1.13},
-                {"x":2, "y":1.0},
+                {"x":2, "y":1},
                 {"x":3, "y":1.13},
                 {"x":4, "y":1.25},
                 {"x":7, "y":1.25},
                 {"x":8, "y":1.13},
-                {"x":9, "y":1.0},
+                {"x":9, "y":1},
                 {"x":10, "y":1.13},
                 {"x":11, "y":1.5},
 
                 {"x":0, "y":2.5},
                 {"x":1, "y":2.13},
-                {"x":2, "y":2.0},
+                {"x":2, "y":2},
                 {"x":3, "y":2.13},
                 {"x":4, "y":2.25},
                 {"x":7, "y":2.25},
                 {"x":8, "y":2.13},
-                {"x":9, "y":2.0},
+                {"x":9, "y":2},
                 {"x":10, "y":2.13},
                 {"x":11, "y":2.5},
 
diff --git a/keyboards/pizzakeyboards/pizza65/info.json b/keyboards/pizzakeyboards/pizza65/info.json
index e488cd3cc59..728de231f5e 100644
--- a/keyboards/pizzakeyboards/pizza65/info.json
+++ b/keyboards/pizzakeyboards/pizza65/info.json
@@ -82,7 +82,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
                 {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
@@ -158,7 +158,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
                 {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
@@ -234,7 +234,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
                 {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
@@ -311,7 +311,7 @@
 
                 {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
                 {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
                 {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
                 {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json
index aa56aa11034..fa22b779590 100644
--- a/keyboards/plywrks/allaro/info.json
+++ b/keyboards/plywrks/allaro/info.json
@@ -63,7 +63,7 @@
                 { "matrix": [0, 13], "x": 15.75, "y": 0.1 },
                 { "matrix": [0, 14], "x": 16.75, "y": 0.1 },
 
-                { "matrix": [1, 0], "x": 0.2, "y": 1.0 },
+                { "matrix": [1, 0], "x": 0.2, "y": 1 },
                 { "matrix": [1, 1], "w": 1.5, "x": 1.35, "y": 1.1 },
                 { "matrix": [1, 2], "x": 2.85, "y": 1.1 },
                 { "matrix": [1, 3], "x": 3.85, "y": 1.1 },
@@ -79,7 +79,7 @@
                 { "matrix": [1, 13], "x": 15.45, "y": 1.1 },
                 { "matrix": [1, 14], "w": 1.5, "x": 16.45, "y": 1.1 },
 
-                { "matrix": [2, 0], "x": 0, "y": 2.0 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
                 { "matrix": [2, 1], "w": 1.75, "x": 1.15, "y": 2.1 },
                 { "matrix": [2, 2], "x": 2.9, "y": 2.1 },
                 { "matrix": [2, 3], "x": 3.9, "y": 2.1 },
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index 9d45bb6c9cb..0ee9115b9ec 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -61,9 +61,9 @@
                 {"x":2.25, "y":3, "matrix": [3, 2]},
                 {"x":3.25, "y":3, "w":2.25, "matrix": [3, 3]},
                 {"x":5.5, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"x":9.0, "y":3, "matrix": [3, 8]},
-                {"x":10.0, "y":3, "matrix": [3, 9]},
-                {"x":11.0, "y":3, "w":1.25, "matrix": [3, 11]}
+                {"x":9, "y":3, "matrix": [3, 8]},
+                {"x":10, "y":3, "matrix": [3, 9]},
+                {"x":11, "y":3, "w":1.25, "matrix": [3, 11]}
             ]
         }
     }
diff --git a/keyboards/ramlord/witf/info.json b/keyboards/ramlord/witf/info.json
index e74343a072c..36cd1dcef5a 100644
--- a/keyboards/ramlord/witf/info.json
+++ b/keyboards/ramlord/witf/info.json
@@ -31,32 +31,32 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [1, 0], "x": 1.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 2.0, "y": 0.0 },
-                { "matrix": [1, 1], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 5.25, "y": 0.0 },
-                { "matrix": [1, 2], "x": 6.75, "y": 0.0 },
-                { "matrix": [0, 3], "x": 7.75, "y": 0.0 },
-                { "matrix": [1, 3], "x": 8.75, "y": 0.0 },
-                { "matrix": [0, 4], "x": 9.75, "y": 0.0 },
-                { "matrix": [1, 5], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 12.0, "y": 0.0 },
-                { "matrix": [1, 6], "x": 14.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 15.5, "y": 0.0 },
-                { "matrix": [1, 7], "x": 17.25, "y": 0.0 },
-                { "matrix": [0, 8], "x": 18.25, "y": 0.0 },
-                { "matrix": [1, 8], "x": 19.25, "y": 0.0 },
-                { "matrix": [0, 9], "x": 20.25, "y": 0.0 },
-                { "matrix": [1, 9], "x": 22.25, "y": 0.0 },
-                { "matrix": [0, 10], "x": 23.25, "y": 0.0 },
-                { "matrix": [1, 10], "x": 24.25, "y": 0.0 },
-                { "matrix": [0, 11], "x": 25.5, "y": 0.0 },
-                { "matrix": [1, 11], "x": 26.5, "y": 0.0 },
-                { "matrix": [2, 0], "x": 0.0, "y": 1.5 },
-                { "matrix": [3, 0], "x": 1.0, "y": 1.5 },
-                { "matrix": [2, 1], "x": 2.0, "y": 1.5 },
-                { "matrix": [3, 1], "x": 3.0, "y": 1.5 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [1, 0], "x": 1, "y": 0 },
+                { "matrix": [0, 1], "x": 2, "y": 0 },
+                { "matrix": [1, 1], "x": 3, "y": 0 },
+                { "matrix": [0, 2], "x": 5.25, "y": 0 },
+                { "matrix": [1, 2], "x": 6.75, "y": 0 },
+                { "matrix": [0, 3], "x": 7.75, "y": 0 },
+                { "matrix": [1, 3], "x": 8.75, "y": 0 },
+                { "matrix": [0, 4], "x": 9.75, "y": 0 },
+                { "matrix": [1, 5], "x": 11, "y": 0 },
+                { "matrix": [0, 6], "x": 12, "y": 0 },
+                { "matrix": [1, 6], "x": 14.5, "y": 0 },
+                { "matrix": [0, 7], "x": 15.5, "y": 0 },
+                { "matrix": [1, 7], "x": 17.25, "y": 0 },
+                { "matrix": [0, 8], "x": 18.25, "y": 0 },
+                { "matrix": [1, 8], "x": 19.25, "y": 0 },
+                { "matrix": [0, 9], "x": 20.25, "y": 0 },
+                { "matrix": [1, 9], "x": 22.25, "y": 0 },
+                { "matrix": [0, 10], "x": 23.25, "y": 0 },
+                { "matrix": [1, 10], "x": 24.25, "y": 0 },
+                { "matrix": [0, 11], "x": 25.5, "y": 0 },
+                { "matrix": [1, 11], "x": 26.5, "y": 0 },
+                { "matrix": [2, 0], "x": 0, "y": 1.5 },
+                { "matrix": [3, 0], "x": 1, "y": 1.5 },
+                { "matrix": [2, 1], "x": 2, "y": 1.5 },
+                { "matrix": [3, 1], "x": 3, "y": 1.5 },
                 { "matrix": [2, 2], "x": 5.25, "y": 1.5 },
                 { "matrix": [3, 2], "x": 6.25, "y": 1.5 },
                 { "matrix": [2, 3], "x": 7.25, "y": 1.5 },
@@ -77,32 +77,32 @@
                 { "matrix": [3, 10], "x": 24.25, "y": 1.5 },
                 { "matrix": [2, 11], "x": 25.5, "y": 1.5 },
                 { "matrix": [3, 11], "x": 26.5, "y": 1.5 },
-                { "matrix": [4, 0], "x": 0.0, "y": 2.5 },
-                { "matrix": [5, 0], "x": 1.0, "y": 2.5 },
-                { "matrix": [4, 1], "x": 2.0, "y": 2.5 },
-                { "h": 2.0, "matrix": [5, 1], "x": 3.0, "y": 2.5 },
-                { "matrix": [4, 2], "w": 1.5, "x": 5.0, "y": 2.5 },
+                { "matrix": [4, 0], "x": 0, "y": 2.5 },
+                { "matrix": [5, 0], "x": 1, "y": 2.5 },
+                { "matrix": [4, 1], "x": 2, "y": 2.5 },
+                { "h": 2, "matrix": [5, 1], "x": 3, "y": 2.5 },
+                { "matrix": [4, 2], "w": 1.5, "x": 5, "y": 2.5 },
                 { "matrix": [5, 2], "x": 6.5, "y": 2.5 },
                 { "matrix": [4, 3], "x": 7.5, "y": 2.5 },
                 { "matrix": [5, 3], "x": 8.5, "y": 2.5 },
                 { "matrix": [4, 4], "x": 9.5, "y": 2.5 },
                 { "matrix": [5, 4], "x": 10.5, "y": 2.5 },
-                { "matrix": [4, 5], "x": 13.0, "y": 2.5 },
-                { "matrix": [4, 6], "x": 14.0, "y": 2.5 },
-                { "matrix": [5, 6], "x": 15.0, "y": 2.5 },
-                { "matrix": [4, 7], "x": 16.0, "y": 2.5 },
-                { "matrix": [5, 7], "x": 17.0, "y": 2.5 },
-                { "matrix": [4, 8], "x": 18.0, "y": 2.5 },
-                { "matrix": [5, 8], "x": 19.0, "y": 2.5 },
-                { "matrix": [4, 9], "w": 1.5, "x": 20.0, "y": 2.5 },
+                { "matrix": [4, 5], "x": 13, "y": 2.5 },
+                { "matrix": [4, 6], "x": 14, "y": 2.5 },
+                { "matrix": [5, 6], "x": 15, "y": 2.5 },
+                { "matrix": [4, 7], "x": 16, "y": 2.5 },
+                { "matrix": [5, 7], "x": 17, "y": 2.5 },
+                { "matrix": [4, 8], "x": 18, "y": 2.5 },
+                { "matrix": [5, 8], "x": 19, "y": 2.5 },
+                { "matrix": [4, 9], "w": 1.5, "x": 20, "y": 2.5 },
                 { "matrix": [5, 9], "x": 22.25, "y": 2.5 },
                 { "matrix": [4, 10], "x": 23.25, "y": 2.5 },
                 { "matrix": [5, 10], "x": 24.25, "y": 2.5 },
                 { "matrix": [4, 11], "x": 25.5, "y": 2.5 },
                 { "matrix": [5, 11], "x": 26.5, "y": 2.5 },
-                { "matrix": [6, 0], "x": 0.0, "y": 3.5 },
-                { "matrix": [7, 0], "x": 1.0, "y": 3.5 },
-                { "matrix": [6, 1], "x": 2.0, "y": 3.5 },
+                { "matrix": [6, 0], "x": 0, "y": 3.5 },
+                { "matrix": [7, 0], "x": 1, "y": 3.5 },
+                { "matrix": [6, 1], "x": 2, "y": 3.5 },
                 { "matrix": [6, 2], "w": 1.75, "x": 4.75, "y": 3.5 },
                 { "matrix": [7, 2], "x": 6.5, "y": 3.5 },
                 { "matrix": [6, 3], "x": 7.5, "y": 3.5 },
@@ -118,36 +118,36 @@
                 { "matrix": [6, 9], "w": 2.25, "x": 19.25, "y": 3.5 },
                 { "matrix": [6, 11], "x": 25.5, "y": 3.5 },
                 { "matrix": [7, 11], "x": 26.5, "y": 3.5 },
-                { "matrix": [8, 0], "x": 0.0, "y": 4.5 },
-                { "matrix": [9, 0], "x": 1.0, "y": 4.5 },
-                { "matrix": [8, 1], "x": 2.0, "y": 4.5 },
-                { "h": 2.0, "matrix": [9, 1], "x": 3.0, "y": 4.5 },
+                { "matrix": [8, 0], "x": 0, "y": 4.5 },
+                { "matrix": [9, 0], "x": 1, "y": 4.5 },
+                { "matrix": [8, 1], "x": 2, "y": 4.5 },
+                { "h": 2, "matrix": [9, 1], "x": 3, "y": 4.5 },
                 { "matrix": [8, 2], "w": 2.25, "x": 4.5, "y": 4.5 },
                 { "matrix": [9, 2], "x": 6.75, "y": 4.5 },
                 { "matrix": [8, 3], "x": 7.75, "y": 4.5 },
                 { "matrix": [9, 3], "x": 8.75, "y": 4.5 },
                 { "matrix": [8, 4], "x": 9.75, "y": 4.5 },
                 { "matrix": [9, 4], "x": 10.75, "y": 4.5 },
-                { "matrix": [9, 5], "x": 13.0, "y": 4.5 },
-                { "matrix": [8, 6], "x": 14.0, "y": 4.5 },
-                { "matrix": [9, 6], "x": 15.0, "y": 4.5 },
-                { "matrix": [8, 7], "x": 16.0, "y": 4.5 },
-                { "matrix": [9, 7], "x": 17.0, "y": 4.5 },
-                { "matrix": [8, 8], "x": 18.0, "y": 4.5 },
-                { "matrix": [8, 9], "w": 1.75, "x": 19.0, "y": 4.5 },
+                { "matrix": [9, 5], "x": 13, "y": 4.5 },
+                { "matrix": [8, 6], "x": 14, "y": 4.5 },
+                { "matrix": [9, 6], "x": 15, "y": 4.5 },
+                { "matrix": [8, 7], "x": 16, "y": 4.5 },
+                { "matrix": [9, 7], "x": 17, "y": 4.5 },
+                { "matrix": [8, 8], "x": 18, "y": 4.5 },
+                { "matrix": [8, 9], "w": 1.75, "x": 19, "y": 4.5 },
                 { "matrix": [9, 8], "x": 20.75, "y": 4.5 },
                 { "matrix": [8, 10], "x": 23.25, "y": 4.5 },
                 { "matrix": [8, 11], "x": 25.5, "y": 4.5 },
                 { "matrix": [9, 11], "x": 26.5, "y": 4.5 },
-                { "matrix": [10, 0], "x": 0.0, "y": 5.5 },
-                { "matrix": [11, 0], "x": 1.0, "y": 5.5 },
-                { "matrix": [10, 1], "x": 2.0, "y": 5.5 },
-                { "matrix": [11, 1], "x": 3.0, "y": 5.5 },
+                { "matrix": [10, 0], "x": 0, "y": 5.5 },
+                { "matrix": [11, 0], "x": 1, "y": 5.5 },
+                { "matrix": [10, 1], "x": 2, "y": 5.5 },
+                { "matrix": [11, 1], "x": 3, "y": 5.5 },
                 { "matrix": [10, 2], "w": 1.5, "x": 4.5, "y": 5.5 },
                 { "matrix": [10, 3], "w": 1.5, "x": 7.75, "y": 5.5 },
                 { "matrix": [10, 4], "w": 2.25, "x": 9.25, "y": 5.5 },
                 { "matrix": [11, 4], "x": 11.5, "y": 5.5 },
-                { "matrix": [10, 6], "w": 2.75, "x": 13.0, "y": 5.5 },
+                { "matrix": [10, 6], "w": 2.75, "x": 13, "y": 5.5 },
                 { "matrix": [10, 7], "w": 1.5, "x": 15.75, "y": 5.5 },
                 { "matrix": [10, 9], "w": 1.5, "x": 20.25, "y": 5.5 },
                 { "matrix": [11, 9], "x": 22.25, "y": 5.5 },
diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json
index fd47ad9924f..e8169348b63 100644
--- a/keyboards/satt/comet46/info.json
+++ b/keyboards/satt/comet46/info.json
@@ -17,10 +17,10 @@
                 {"label":"Q", "x":1, "y":0.45},
                 {"label":"W", "x":2, "y":0.15},
                 {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.30},
+                {"label":"R", "x":4, "y":0.3},
                 {"label":"T", "x":5, "y":0.45},
                 {"label":"Y", "x":9, "y":0.45},
-                {"label":"U", "x":10, "y":0.30},
+                {"label":"U", "x":10, "y":0.3},
                 {"label":"I", "x":11, "y":0},
                 {"label":"O", "x":12, "y":0.15},
                 {"label":"P", "x":13, "y":0.45},
@@ -30,12 +30,12 @@
                 {"label":"A", "x":1, "y":1.45},
                 {"label":"S", "x":2, "y":1.15},
                 {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.30},
+                {"label":"F", "x":4, "y":1.3},
                 {"label":"G", "x":5, "y":1.45},
                 {"label":"ESC", "x":6, "y":1},
                 {"label":"DEL", "x":8, "y":1},
                 {"label":"H", "x":9, "y":1.45},
-                {"label":"J", "x":10, "y":1.30},
+                {"label":"J", "x":10, "y":1.3},
                 {"label":"K", "x":11, "y":1},
                 {"label":"L", "x":12, "y":1.15},
                 {"label":"SCLN", "x":13, "y":1.45},
@@ -45,12 +45,12 @@
                 {"label":"Z", "x":1, "y":2.45},
                 {"label":"X", "x":2, "y":2.15},
                 {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.30},
+                {"label":"V", "x":4, "y":2.3},
                 {"label":"B", "x":5, "y":2.45},
                 {"label":"LCBR", "x":6, "y":2},
                 {"label":"RCBR", "x":8, "y":2},
                 {"label":"N", "x":9, "y":2.45},
-                {"label":"M", "x":10, "y":2.30},
+                {"label":"M", "x":10, "y":2.3},
                 {"label":"COMM", "x":11, "y":2},
                 {"label":"DOT", "x":12, "y":2.15},
                 {"label":"SLSH", "x":13, "y":2.45},
diff --git a/keyboards/slz40/info.json b/keyboards/slz40/info.json
index 788fe1db952..25d250e848d 100644
--- a/keyboards/slz40/info.json
+++ b/keyboards/slz40/info.json
@@ -72,11 +72,11 @@
                 
                 {"label": "ctrl", "x": 0, "y": 4, "w": 1.25},
                 {"label": "qui", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "alt", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "alt", "x": 2.5, "y": 4, "w": 1.25},
                 {"label": "del", "x": 3.75, "y": 4, "w": 1.25},
                 {"label": "enter", "x": 5, "y": 4, "w": 1.75},
                 {"label": "space", "x": 6.75, "y": 4, "w": 1.75},
-                {"label": "'", "x": 8.50, "y": 4, "w": 1.5},
+                {"label": "'", "x": 8.5, "y": 4, "w": 1.5},
                 {"label": "left", "x": 10, "y": 4},
                 {"label": "down", "x": 11, "y": 4},
                 {"label": "right", "x": 12, "y": 4}
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 0b107f335c3..f2067d6aeda 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -55,19 +55,19 @@
                 {"x": 16.25, "y": 1},
 
                 {"x": 1.25, "y": 2, "w": 1.75},
-                {"x": 3.0, "y": 2},
-                {"x": 4.0, "y": 2},
-                {"x": 5.0, "y": 2},
-                {"x": 6.0, "y": 2},
-                {"x": 7.0, "y": 2},
-                {"x": 8.0, "y": 2},
-                {"x": 9.0, "y": 2},
-                {"x": 10.0, "y": 2},
-                {"x": 11.0, "y": 2},
-                {"x": 12.0, "y": 2},
-                {"x": 13.0, "y": 2},
-                {"x": 14.0, "y": 2},
-                {"x": 15.0, "y": 1, "w": 1.25, "h": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 1, "w": 1.25, "h": 2},
                 {"x": 16.25, "y": 2},
 
                 {"x": 0, "y": 3},
@@ -91,7 +91,7 @@
                 {"x": 1.25, "y": 4, "w": 1.25},
                 {"x": 2.5, "y": 4, "w": 1.25},
                 {"x": 3.75, "y": 4, "w": 1.25},
-                {"x": 5.0, "y": 4, "w": 6.25},
+                {"x": 5, "y": 4, "w": 6.25},
                 {"x": 11.25, "y": 4},
                 {"x": 12.25, "y": 4},
                 {"x": 13.25, "y": 4},
diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json
index 44b2f9a5dd5..32b7c90d441 100644
--- a/keyboards/torn/info.json
+++ b/keyboards/torn/info.json
@@ -56,10 +56,10 @@
         {"label":"SW40", "x":14, "y":2.375},
         {"label":"SW19", "x":3, "y":3.1},
         {"label":"SW20", "x":4, "y":3.25},
-        {"label":"SW21", "x":5, "y":3.40},
+        {"label":"SW21", "x":5, "y":3.4},
         {"label":"SW22", "x":6, "y":3.55},
         {"label":"SW41", "x":8, "y":3.55},
-        {"label":"SW42", "x":9, "y":3.40},
+        {"label":"SW42", "x":9, "y":3.4},
         {"label":"SW43", "x":10, "y":3.25},
         {"label":"SW44", "x":11, "y":3.1}
       ]
diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json
index 5d3d081f739..2b311ea40fd 100644
--- a/keyboards/uranuma/info.json
+++ b/keyboards/uranuma/info.json
@@ -22,8 +22,8 @@
         {"label":"k01", "x":1 , "y":0.36},
         {"label":"k02", "x":2 , "y":0},
         {"label":"k03", "x":3 , "y":0.09},
-        {"label":"k04", "x":4 , "y":0.70},
-        {"label":"k05", "x":8 , "y":0.70},
+        {"label":"k04", "x":4 , "y":0.7},
+        {"label":"k05", "x":8 , "y":0.7},
         {"label":"k06", "x":9 , "y":0.09},
         {"label":"k07", "x":10, "y":0},
         {"label":"k08", "x":11, "y":0.36},
@@ -33,8 +33,8 @@
         {"label":"k11", "x":1 , "y":1.36},
         {"label":"k12", "x":2 , "y":1},
         {"label":"k13", "x":3 , "y":1.09},
-        {"label":"k14", "x":4 , "y":1.70},
-        {"label":"k15", "x":8 , "y":1.70},
+        {"label":"k14", "x":4 , "y":1.7},
+        {"label":"k15", "x":8 , "y":1.7},
         {"label":"k16", "x":9 , "y":1.09},
         {"label":"k17", "x":10, "y":1},
         {"label":"k18", "x":11, "y":1.36},
@@ -44,8 +44,8 @@
         {"label":"k21", "x":1 , "y":2.36},
         {"label":"k22", "x":2 , "y":2},
         {"label":"k23", "x":3 , "y":2.09},
-        {"label":"k24", "x":4 , "y":2.70},
-        {"label":"k25", "x":8 , "y":2.70},
+        {"label":"k24", "x":4 , "y":2.7},
+        {"label":"k25", "x":8 , "y":2.7},
         {"label":"k26", "x":9 , "y":2.09},
         {"label":"k27", "x":10, "y":2},
         {"label":"k28", "x":11, "y":2.36},
@@ -55,19 +55,19 @@
         {"label":"k31", "x":1 , "y":3.36},
         {"label":"k32", "x":2 , "y":3},
         {"label":"k33", "x":3 , "y":3.09},
-        {"label":"k34", "x":4 , "y":3.70},
+        {"label":"k34", "x":4 , "y":3.7},
         {"label":"k44", "x":5, "y":2.44, "h":2},
         {"label":"k45", "x":7, "y":2.44, "h":2},
-        {"label":"k35", "x":8 , "y":3.70},
+        {"label":"k35", "x":8 , "y":3.7},
         {"label":"k36", "x":9 , "y":3.09},
         {"label":"k37", "x":10, "y":3},
         {"label":"k38", "x":11, "y":3.36},
         {"label":"k39", "x":12, "y":3.62},
 
-        {"label":"k40", "x":0, "y":4.70, "w":1.5},
-        {"label":"k41", "x":1.5, "y":4.70},
-        {"label":"k48", "x":10.5, "y":4.70},
-        {"label":"k49", "x":11.5, "y":4.70, "w":1.5}
+        {"label":"k40", "x":0, "y":4.7, "w":1.5},
+        {"label":"k41", "x":1.5, "y":4.7},
+        {"label":"k48", "x":10.5, "y":4.7},
+        {"label":"k49", "x":11.5, "y":4.7, "w":1.5}
       ]
     }
   }
diff --git a/keyboards/wilba_tech/rama_works_m10_b/info.json b/keyboards/wilba_tech/rama_works_m10_b/info.json
index 01337765867..36ebf715826 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/info.json
+++ b/keyboards/wilba_tech/rama_works_m10_b/info.json
@@ -30,7 +30,7 @@
         { "x": 0, "y": 2 },
         { "x": 1, "y": 2 },
         { "x": 2, "y": 2 },
-        { "x": 1, "y": 3, "w": 2.0 }
+        { "x": 1, "y": 3, "w": 2 }
       ]
     }
   }
diff --git a/keyboards/zykrah/fuyu/info.json b/keyboards/zykrah/fuyu/info.json
index f0848787cdf..a284f0616b9 100644
--- a/keyboards/zykrah/fuyu/info.json
+++ b/keyboards/zykrah/fuyu/info.json
@@ -30,41 +30,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
-                { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
-                { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
-                { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 13], "x": 14.0, "y": 1.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": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 13], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -81,7 +81,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -97,7 +97,7 @@
                 { "matrix": [3, 14], "x": 15.25, "y": 3.25 },
                 { "matrix": [3, 15], "x": 16.25, "y": 3.25 },
                 { "matrix": [3, 16], "x": 17.25, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.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 },
@@ -110,15 +110,15 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 14], "x": 15.25, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
                 { "matrix": [4, 16], "x": 17.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/zykrah/slime88/info.json b/keyboards/zykrah/slime88/info.json
index 0bbb0297fb1..3f6f37576e4 100644
--- a/keyboards/zykrah/slime88/info.json
+++ b/keyboards/zykrah/slime88/info.json
@@ -26,42 +26,42 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
-                { "matrix": [0, 1], "x": 1.25, "y": 0.0 },
-                { "matrix": [0, 2], "x": 2.25, "y": 0.0 },
-                { "matrix": [0, 3], "x": 3.25, "y": 0.0 },
-                { "matrix": [0, 4], "x": 4.25, "y": 0.0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
-                { "matrix": [0, 9], "x": 9.75, "y": 0.0 },
-                { "matrix": [0, 10], "x": 10.75, "y": 0.0 },
-                { "matrix": [0, 11], "x": 11.75, "y": 0.0 },
-                { "matrix": [0, 12], "x": 12.75, "y": 0.0 },
-                { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
-                { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
-                { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
-                { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
-                { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
-                { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
-                { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
-                { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
-                { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
-                { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
-                { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
-                { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
-                { "matrix": [3, 13], "x": 14.0, "y": 1.25 },
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.25, "y": 0 },
+                { "matrix": [0, 3], "x": 3.25, "y": 0 },
+                { "matrix": [0, 4], "x": 4.25, "y": 0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0 },
+                { "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "matrix": [0, 13], "x": 14, "y": 0 },
+                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                { "matrix": [0, 15], "x": 16.25, "y": 0 },
+                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.25 },
+                { "matrix": [1, 2], "x": 2, "y": 1.25 },
+                { "matrix": [1, 3], "x": 3, "y": 1.25 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 5, "y": 1.25 },
+                { "matrix": [1, 6], "x": 6, "y": 1.25 },
+                { "matrix": [1, 7], "x": 7, "y": 1.25 },
+                { "matrix": [1, 8], "x": 8, "y": 1.25 },
+                { "matrix": [1, 9], "x": 9, "y": 1.25 },
+                { "matrix": [1, 10], "x": 10, "y": 1.25 },
+                { "matrix": [1, 11], "x": 11, "y": 1.25 },
+                { "matrix": [1, 12], "x": 12, "y": 1.25 },
+                { "matrix": [1, 13], "x": 13, "y": 1.25 },
+                { "matrix": [3, 13], "x": 14, "y": 1.25 },
                 { "matrix": [1, 14], "x": 15.25, "y": 1.25 },
                 { "matrix": [1, 15], "x": 16.25, "y": 1.25 },
                 { "matrix": [1, 16], "x": 17.25, "y": 1.25 },
-                { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+                { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
                 { "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 },
@@ -78,7 +78,7 @@
                 { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
                 { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
                 { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
-                { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+                { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
                 { "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 },
@@ -91,7 +91,7 @@
                 { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
                 { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
                 { "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3.25 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.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 },
@@ -104,13 +104,13 @@
                 { "matrix": [4, 10], "x": 10.25, "y": 4.25 },
                 { "matrix": [4, 11], "x": 11.25, "y": 4.25 },
                 { "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+                { "matrix": [4, 13], "x": 14, "y": 4.25 },
                 { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
-                { "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+                { "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
                 { "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
                 { "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
                 { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+                { "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
                 { "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
                 { "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
                 { "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 5.25 },