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

271 files changed, 19026 insertions, 31830 deletions

diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index ac7db0ec13..a0b04ba7df 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -36,15 +36,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/1k/info.json b/keyboards/1k/info.json
index 121cba7d16..090e93b94b 100644
--- a/keyboards/1k/info.json
+++ b/keyboards/1k/info.json
@@ -19,7 +19,7 @@
   "layouts": {
     "LAYOUT_ortho_1x1": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]}
+        {"x": 0, "y": 0, "matrix": [0, 0]}
       ]
     }
   }
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index 31042e9a5d..01701aedeb 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -27,12 +27,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.5, "y":0, "matrix": [0, 4]},
-                {"x":2.5, "y":0, "matrix": [0, 5]},
-                {"x":0, "y":1, "matrix": [0, 0]},
-                {"x":1, "y":1, "matrix": [0, 1]},
-                {"x":2, "y":1, "matrix": [0, 2]},
-                {"x":3, "y":1, "matrix": [0, 3]}
+                {"x": 0.5, "y": 0, "matrix": [0, 4]},
+                {"x": 2.5, "y": 0, "matrix": [0, 5]},
+                {"x": 0, "y": 1, "matrix": [0, 0]},
+                {"x": 1, "y": 1, "matrix": [0, 1]},
+                {"x": 2, "y": 1, "matrix": [0, 2]},
+                {"x": 3, "y": 1, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
index 12ede4172c..9709807612 100644
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -21,10 +21,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 389aad3619..aa5e039637 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -19,190 +19,190 @@
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]}
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]}
             ]
         },
         "LAYOUT_ortho_4x8": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
-                {"x":4, "y":2, "matrix": [2, 4]},
-                {"x":5, "y":2, "matrix": [2, 5]},
-                {"x":6, "y":2, "matrix": [2, 6]},
-                {"x":7, "y":2, "matrix": [2, 7]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]},
-                {"x":4, "y":3, "matrix": [3, 4]},
-                {"x":5, "y":3, "matrix": [3, 5]},
-                {"x":6, "y":3, "matrix": [3, 6]},
-                {"x":7, "y":3, "matrix": [3, 7]}
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]}
             ]
         },
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
-                {"x":8, "y":1, "matrix": [1, 8]},
-                {"x":9, "y":1, "matrix": [1, 9]},
-                {"x":10, "y":1, "matrix": [1, 10]},
-                {"x":11, "y":1, "matrix": [1, 11]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
-                {"x":4, "y":2, "matrix": [2, 4]},
-                {"x":5, "y":2, "matrix": [2, 5]},
-                {"x":6, "y":2, "matrix": [2, 6]},
-                {"x":7, "y":2, "matrix": [2, 7]},
-                {"x":8, "y":2, "matrix": [2, 8]},
-                {"x":9, "y":2, "matrix": [2, 9]},
-                {"x":10, "y":2, "matrix": [2, 10]},
-                {"x":11, "y":2, "matrix": [2, 11]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
+                {"x": 8, "y": 2, "matrix": [2, 8]},
+                {"x": 9, "y": 2, "matrix": [2, 9]},
+                {"x": 10, "y": 2, "matrix": [2, 10]},
+                {"x": 11, "y": 2, "matrix": [2, 11]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]},
-                {"x":4, "y":3, "matrix": [3, 4]},
-                {"x":5, "y":3, "matrix": [3, 5]},
-                {"x":6, "y":3, "matrix": [3, 6]},
-                {"x":7, "y":3, "matrix": [3, 7]},
-                {"x":8, "y":3, "matrix": [3, 8]},
-                {"x":9, "y":3, "matrix": [3, 9]},
-                {"x":10, "y":3, "matrix": [3, 10]},
-                {"x":11, "y":3, "matrix": [3, 11]}
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]},
+                {"x": 8, "y": 3, "matrix": [3, 8]},
+                {"x": 9, "y": 3, "matrix": [3, 9]},
+                {"x": 10, "y": 3, "matrix": [3, 10]},
+                {"x": 11, "y": 3, "matrix": [3, 11]}
             ]
         },
         "LAYOUT_ortho_4x16": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
-                {"x":15, "y":0, "matrix": [0, 15]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
+                {"x": 15, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":6, "y":1, "matrix": [1, 6]},
-                {"x":7, "y":1, "matrix": [1, 7]},
-                {"x":8, "y":1, "matrix": [1, 8]},
-                {"x":9, "y":1, "matrix": [1, 9]},
-                {"x":10, "y":1, "matrix": [1, 10]},
-                {"x":11, "y":1, "matrix": [1, 11]},
-                {"x":12, "y":1, "matrix": [1, 12]},
-                {"x":13, "y":1, "matrix": [1, 13]},
-                {"x":14, "y":1, "matrix": [1, 14]},
-                {"x":15, "y":1, "matrix": [1, 15]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 6, "y": 1, "matrix": [1, 6]},
+                {"x": 7, "y": 1, "matrix": [1, 7]},
+                {"x": 8, "y": 1, "matrix": [1, 8]},
+                {"x": 9, "y": 1, "matrix": [1, 9]},
+                {"x": 10, "y": 1, "matrix": [1, 10]},
+                {"x": 11, "y": 1, "matrix": [1, 11]},
+                {"x": 12, "y": 1, "matrix": [1, 12]},
+                {"x": 13, "y": 1, "matrix": [1, 13]},
+                {"x": 14, "y": 1, "matrix": [1, 14]},
+                {"x": 15, "y": 1, "matrix": [1, 15]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
-                {"x":4, "y":2, "matrix": [2, 4]},
-                {"x":5, "y":2, "matrix": [2, 5]},
-                {"x":6, "y":2, "matrix": [2, 6]},
-                {"x":7, "y":2, "matrix": [2, 7]},
-                {"x":8, "y":2, "matrix": [2, 8]},
-                {"x":9, "y":2, "matrix": [2, 9]},
-                {"x":10, "y":2, "matrix": [2, 10]},
-                {"x":11, "y":2, "matrix": [2, 11]},
-                {"x":12, "y":2, "matrix": [2, 12]},
-                {"x":13, "y":2, "matrix": [2, 13]},
-                {"x":14, "y":2, "matrix": [2, 14]},
-                {"x":15, "y":2, "matrix": [2, 15]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 6, "y": 2, "matrix": [2, 6]},
+                {"x": 7, "y": 2, "matrix": [2, 7]},
+                {"x": 8, "y": 2, "matrix": [2, 8]},
+                {"x": 9, "y": 2, "matrix": [2, 9]},
+                {"x": 10, "y": 2, "matrix": [2, 10]},
+                {"x": 11, "y": 2, "matrix": [2, 11]},
+                {"x": 12, "y": 2, "matrix": [2, 12]},
+                {"x": 13, "y": 2, "matrix": [2, 13]},
+                {"x": 14, "y": 2, "matrix": [2, 14]},
+                {"x": 15, "y": 2, "matrix": [2, 15]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]},
-                {"x":4, "y":3, "matrix": [3, 4]},
-                {"x":5, "y":3, "matrix": [3, 5]},
-                {"x":6, "y":3, "matrix": [3, 6]},
-                {"x":7, "y":3, "matrix": [3, 7]},
-                {"x":8, "y":3, "matrix": [3, 8]},
-                {"x":9, "y":3, "matrix": [3, 9]},
-                {"x":10, "y":3, "matrix": [3, 10]},
-                {"x":11, "y":3, "matrix": [3, 11]},
-                {"x":12, "y":3, "matrix": [3, 12]},
-                {"x":13, "y":3, "matrix": [3, 13]},
-                {"x":14, "y":3, "matrix": [3, 14]},
-                {"x":15, "y":3, "matrix": [3, 15]}
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 6, "y": 3, "matrix": [3, 6]},
+                {"x": 7, "y": 3, "matrix": [3, 7]},
+                {"x": 8, "y": 3, "matrix": [3, 8]},
+                {"x": 9, "y": 3, "matrix": [3, 9]},
+                {"x": 10, "y": 3, "matrix": [3, 10]},
+                {"x": 11, "y": 3, "matrix": [3, 11]},
+                {"x": 12, "y": 3, "matrix": [3, 12]},
+                {"x": 13, "y": 3, "matrix": [3, 13]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
+                {"x": 15, "y": 3, "matrix": [3, 15]}
             ]
         }
     }
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index ddcf567d83..21e5c2d1d2 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -25,14 +25,14 @@
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }
diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
index 9a335dad43..0712923e49 100644
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -20,15 +20,15 @@
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index f0ba7f1aff..3483c7d4df 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -30,12 +30,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
           "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
           ]
         }
     }
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 3a9ab63b73..4362ab761d 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -11,10 +11,8 @@
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",
     "matrix_pins": {
-        "rows":
-        ["B14", "B15", "B6", "B5", "B4"],
-        "cols":
-        ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
+        "rows": ["B14", "B15", "B6", "B5", "B4"],
+        "cols": ["B2", "A4", "A1", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B12", "B3"]
     },
     "diode_direction": "COL2ROW",
     "features": {
@@ -53,205 +51,205 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"|", "matrix": [1, 13], "x":13.5, "y":1},
-                {"label":"Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"nubs", "matrix": [3, 13], "x":12.75, "y":2},
-                {"label":"Enter", "matrix": [2, 13], "x":13.75, "y":2, "w":0.75},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":1.25},
-                {"label":"nubs", "matrix": [3, 1], "x":1.25, "y":3},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                 {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                 {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                 {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                 {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":1.25},
-                 {"label":"\u2191", "matrix": [4, 13], "x":13.5, "y":3},
-                 {"label":"Caps", "matrix": [4, 0], "x":0, "y":4},
-                 {"label":"opt", "matrix": [4, 1], "x":1, "y":4},
-                 {"label":"Cmd", "matrix": [4, 2], "x":2, "y":4, "w":1.75},
-                 {"label":"`", "matrix": [4, 3], "x":3.75, "y":4},
-                 {"label":"Space", "matrix": [4, 6], "x":4.75, "y":4, "w":4.75},
-                 {"label":"\\", "matrix": [4, 8], "x":9.5, "y":4},
-                 {"label":"\u2190", "matrix": [4, 9], "x":10.5, "y":4},
-                 {"label":"\u2192", "matrix": [4, 10], "x":11.5, "y":4},
-                 {"label":"\u2193", "matrix": [4, 11], "x":12.5, "y":4},
-                 {"label":"\u2191", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "nubs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 0.75},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                 {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                 {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                 {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                 {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                 {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                 {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                 {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                 {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                 {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                 {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                 {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                 {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                 {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                 {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                 {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         },
         "LAYOUT_m0116": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"Enter", "matrix": [2, 13], "x":13.5, "y":1, "h":2},
-                {"label":"Control", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.25},
-                {"label":"Caps", "matrix": [4, 0], "x":0, "y":4},
-                {"label":"opt", "matrix": [4, 1], "x":1, "y":4},
-                {"label":"Cmd", "matrix": [4, 2], "x":2, "y":4, "w":1.75},
-                {"label":"`", "matrix": [4, 3], "x":3.75, "y":4},
-                {"label":"Space", "matrix": [4, 6], "x":4.75, "y":4, "w":4.75},
-                {"label":"\\", "matrix": [4, 8], "x":9.5, "y":4},
-                {"label":"\u2190", "matrix": [4, 9], "x":10.5, "y":4},
-                {"label":"\u2192", "matrix": [4, 10], "x":11.5, "y":4},
-                {"label":"\u2193", "matrix": [4, 11], "x":12.5, "y":4},
-                {"label":"\u2191", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.5, "y": 1, "h": 2},
+                {"label": "Control", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25},
+                {"label": "Caps", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "opt", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Cmd", "matrix": [4, 2], "x": 2, "y": 4, "w": 1.75},
+                {"label": "`", "matrix": [4, 3], "x": 3.75, "y": 4},
+                {"label": "Space", "matrix": [4, 6], "x": 4.75, "y": 4, "w": 4.75},
+                {"label": "\\", "matrix": [4, 8], "x": 9.5, "y": 4},
+                {"label": "\u2190", "matrix": [4, 9], "x": 10.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2191", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         },
         "LAYOUT_m0118": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"!", "matrix": [0, 1], "x":1, "y":0},
-                {"label":"@", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"#", "matrix": [0, 3], "x":3, "y":0},
-                {"label":"$", "matrix": [0, 4], "x":4, "y":0},
-                {"label":"%", "matrix": [0, 5], "x":5, "y":0},
-                {"label":"^", "matrix": [0, 6], "x":6, "y":0},
-                {"label":"&", "matrix": [0, 7], "x":7, "y":0},
-                {"label":"*", "matrix": [0, 8], "x":8, "y":0},
-                {"label":"(", "matrix": [0, 9], "x":9, "y":0},
-                {"label":")", "matrix": [0, 10], "x":10, "y":0},
-                {"label":"_", "matrix": [0, 11], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 12], "x":12, "y":0},
-                {"label":"Backsp", "matrix": [0, 13], "x":13, "y":0, "w":1.5},
-                {"label":"Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [1, 1], "x":1.5, "y":1},
-                {"label":"W", "matrix": [1, 2], "x":2.5, "y":1},
-                {"label":"E", "matrix": [1, 3], "x":3.5, "y":1},
-                {"label":"R", "matrix": [1, 4], "x":4.5, "y":1},
-                {"label":"T", "matrix": [1, 5], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [1, 6], "x":6.5, "y":1},
-                {"label":"U", "matrix": [1, 7], "x":7.5, "y":1},
-                {"label":"I", "matrix": [1, 8], "x":8.5, "y":1},
-                {"label":"O", "matrix": [1, 9], "x":9.5, "y":1},
-                {"label":"P", "matrix": [1, 10], "x":10.5, "y":1},
-                {"label":"{", "matrix": [1, 11], "x":11.5, "y":1},
-                {"label":"}", "matrix": [1, 12], "x":12.5, "y":1},
-                {"label":"Enter", "matrix": [2, 13], "x":13.75, "y":1, "w":0.75, "h":2},
-                {"label":"Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [2, 1], "x":1.75, "y":2},
-                {"label":"S", "matrix": [2, 2], "x":2.75, "y":2},
-                {"label":"D", "matrix": [2, 3], "x":3.75, "y":2},
-                {"label":"F", "matrix": [2, 4], "x":4.75, "y":2},
-                {"label":"G", "matrix": [2, 5], "x":5.75, "y":2},
-                {"label":"H", "matrix": [2, 6], "x":6.75, "y":2},
-                {"label":"J", "matrix": [2, 7], "x":7.75, "y":2},
-                {"label":"K", "matrix": [2, 8], "x":8.75, "y":2},
-                {"label":"L", "matrix": [2, 9], "x":9.75, "y":2},
-                {"label":":", "matrix": [2, 10], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [2, 11], "x":11.75, "y":2},
-                {"label":"nuhs", "matrix": [3, 13], "x":12.75, "y":2},
-                {"label":"Shift", "matrix": [3, 0], "x":0, "y":3, "w":1.25},
-                {"label":"nubs", "matrix": [3, 1], "x":1.25, "y":3},
-                {"label":"Z", "matrix": [3, 2], "x":2.25, "y":3},
-                {"label":"X", "matrix": [3, 3], "x":3.25, "y":3},
-                {"label":"C", "matrix": [3, 4], "x":4.25, "y":3},
-                {"label":"V", "matrix": [3, 5], "x":5.25, "y":3},
-                {"label":"B", "matrix": [3, 6], "x":6.25, "y":3},
-                {"label":"N", "matrix": [3, 7], "x":7.25, "y":3},
-                {"label":"M", "matrix": [3, 8], "x":8.25, "y":3},
-                {"label":"<", "matrix": [3, 9], "x":9.25, "y":3},
-                {"label":">", "matrix": [3, 10], "x":10.25, "y":3},
-                {"label":"?", "matrix": [3, 11], "x":11.25, "y":3},
-                {"label":"Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":1.25},
-                {"label":"\u2191", "matrix": [4, 13], "x":13.5, "y":3},
-                {"label":"Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25},
-                {"label":"Opt", "matrix": [4, 2], "x":1.25, "y":4, "w":1.5},
-                {"label":"Cmd", "matrix": [4, 3], "x":2.75, "y":4, "w":1.75},
-                {"label":"Space", "matrix": [4, 6], "x":4.5, "y":4, "w":5.25},
-                {"label":"Cmd", "matrix": [4, 9], "x":9.75, "y":4, "w":1.75},
-                {"label":"\u2190", "matrix": [4, 10], "x":11.5, "y":4},
-                {"label":"\u2192", "matrix": [4, 11], "x":12.5, "y":4},
-                {"label":"\u2193", "matrix": [4, 12], "x":13.5, "y":4}
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backsp", "matrix": [0, 13], "x": 13, "y": 0, "w": 1.5},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 0.75, "h": 2},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "nuhs", "matrix": [3, 13], "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "nubs", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25},
+                {"label": "\u2191", "matrix": [4, 13], "x": 13.5, "y": 3},
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Opt", "matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Cmd", "matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.75},
+                {"label": "Space", "matrix": [4, 6], "x": 4.5, "y": 4, "w": 5.25},
+                {"label": "Cmd", "matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.75},
+                {"label": "\u2190", "matrix": [4, 10], "x": 11.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 11], "x": 12.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 13.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/8pack/rev11/info.json b/keyboards/8pack/rev11/info.json
index 6d4d61fe13..9e64760a3b 100644
--- a/keyboards/8pack/rev11/info.json
+++ b/keyboards/8pack/rev11/info.json
@@ -5,14 +5,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [1, 3]},
-                {"x":1, "y":0, "matrix": [1, 2]},
-                {"x":2, "y":0, "matrix": [1, 1]},
-                {"x":3, "y":0, "matrix": [1, 0]},
-                {"x":0, "y":1, "matrix": [0, 3]},
-                {"x":1, "y":1, "matrix": [0, 2]},
-                {"x":2, "y":1, "matrix": [0, 1]},
-                {"x":3, "y":1, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [1, 3]},
+                {"x": 1, "y": 0, "matrix": [1, 2]},
+                {"x": 2, "y": 0, "matrix": [1, 1]},
+                {"x": 3, "y": 0, "matrix": [1, 0]},
+                {"x": 0, "y": 1, "matrix": [0, 3]},
+                {"x": 1, "y": 1, "matrix": [0, 2]},
+                {"x": 2, "y": 1, "matrix": [0, 1]},
+                {"x": 3, "y": 1, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/8pack/rev12/info.json b/keyboards/8pack/rev12/info.json
index 05b1a290ae..1fa5317923 100644
--- a/keyboards/8pack/rev12/info.json
+++ b/keyboards/8pack/rev12/info.json
@@ -5,14 +5,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 3]},
-                {"x":1, "y":0, "matrix": [0, 2]},
-                {"x":2, "y":0, "matrix": [0, 1]},
-                {"x":3, "y":0, "matrix": [0, 0]},
-                {"x":0, "y":1, "matrix": [1, 3]},
-                {"x":1, "y":1, "matrix": [1, 2]},
-                {"x":2, "y":1, "matrix": [1, 1]},
-                {"x":3, "y":1, "matrix": [1, 0]}
+                {"x": 0, "y": 0, "matrix": [0, 3]},
+                {"x": 1, "y": 0, "matrix": [0, 2]},
+                {"x": 2, "y": 0, "matrix": [0, 1]},
+                {"x": 3, "y": 0, "matrix": [0, 0]},
+                {"x": 0, "y": 1, "matrix": [1, 3]},
+                {"x": 1, "y": 1, "matrix": [1, 2]},
+                {"x": 2, "y": 1, "matrix": [1, 1]},
+                {"x": 3, "y": 1, "matrix": [1, 0]}
             ]
         }
     }
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 8982caaae3..febf1e61f6 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/keyboards/adafruit/macropad/info.json
@@ -37,19 +37,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":0, "y":4, "matrix": [4, 0]},
-                {"x":1, "y":4, "matrix": [4, 1]},
-                {"x":2, "y":4, "matrix": [4, 2]}
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
             ]
         }
     }
diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/info.json
index 1a9f6e064c..ad51b7ce6c 100644
--- a/keyboards/anavi/knobs3/info.json
+++ b/keyboards/anavi/knobs3/info.json
@@ -53,9 +53,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label":"Mute", "x": 0, "y": 0, "matrix": [0, 0] },
-                { "label":"RGB", "x": 0, "y": 1, "matrix": [0, 1] },
-                { "label":"Animation", "x": 0, "y": 2, "matrix": [0, 2] }
+                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "RGB", "x": 0, "y": 1, "matrix": [0, 1]},
+                {"label": "Animation", "x": 0, "y": 2, "matrix": [0, 2]}
             ]
         }
     },
diff --git a/keyboards/anavi/macropad8/info.json b/keyboards/anavi/macropad8/info.json
index 9032ac5fa8..1fa276d94e 100644
--- a/keyboards/anavi/macropad8/info.json
+++ b/keyboards/anavi/macropad8/info.json
@@ -26,14 +26,14 @@
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]}
       ]
     }
   }
diff --git a/keyboards/arrayperipherals/1x4p1/info.json b/keyboards/arrayperipherals/1x4p1/info.json
index 2cc838bc92..6d450188c9 100644
--- a/keyboards/arrayperipherals/1x4p1/info.json
+++ b/keyboards/arrayperipherals/1x4p1/info.json
@@ -23,11 +23,11 @@
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":4, "y":0, "matrix": [0, 4]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 4, "y": 0, "matrix": [0, 4]}
       ]
     }
   }
diff --git a/keyboards/atreus/info.json b/keyboards/atreus/info.json
index 724fcca78d..f348e40aee 100644
--- a/keyboards/atreus/info.json
+++ b/keyboards/atreus/info.json
@@ -10,7 +10,57 @@
   },
   "layouts": {
     "LAYOUT": {
-      "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.35}, {"x":2, "y":0}, {"x":3, "y":0.35}, {"x":4, "y":0.7}, {"x":8, "y":0.7}, {"x":9, "y":0.35}, {"x":10, "y":0}, {"x":11, "y":0.35}, {"x":12, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.35}, {"x":2, "y":1}, {"x":3, "y":1.35}, {"x":4, "y":1.7}, {"x":8, "y":1.7}, {"x":9, "y":1.35}, {"x":10, "y":1}, {"x":11, "y":1.35}, {"x":12, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.35}, {"x":2, "y":2}, {"x":3, "y":2.35}, {"x":4, "y":2.7}, {"x":8, "y":2.7}, {"x":9, "y":2.35}, {"x":10, "y":2}, {"x":11, "y":2.35}, {"x":12, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.35}, {"x":2, "y":3}, {"x":3, "y":3.35}, {"x":4, "y":3.7}, {"x":5, "y":2.95, "h":1.5}, {"x":7, "y":2.95, "h":1.5}, {"x":8, "y":3.7}, {"x":9, "y":3.35}, {"x":10, "y":3}, {"x":11, "y":3.35}, {"x":12, "y":3.6}]
+      "layout": [
+        {"x": 0, "y": 0.6},
+        {"x": 1, "y": 0.35},
+        {"x": 2, "y": 0},
+        {"x": 3, "y": 0.35},
+        {"x": 4, "y": 0.7},
+
+        {"x": 8, "y": 0.7},
+        {"x": 9, "y": 0.35},
+        {"x": 10, "y": 0},
+        {"x": 11, "y": 0.35},
+        {"x": 12, "y": 0.6},
+
+        {"x": 0, "y": 1.6},
+        {"x": 1, "y": 1.35},
+        {"x": 2, "y": 1},
+        {"x": 3, "y": 1.35},
+        {"x": 4, "y": 1.7},
+
+        {"x": 8, "y": 1.7},
+        {"x": 9, "y": 1.35},
+        {"x": 10, "y": 1},
+        {"x": 11, "y": 1.35},
+        {"x": 12, "y": 1.6},
+
+        {"x": 0, "y": 2.6},
+        {"x": 1, "y": 2.35},
+        {"x": 2, "y": 2},
+        {"x": 3, "y": 2.35},
+        {"x": 4, "y": 2.7},
+
+        {"x": 8, "y": 2.7},
+        {"x": 9, "y": 2.35},
+        {"x": 10, "y": 2},
+        {"x": 11, "y": 2.35},
+        {"x": 12, "y": 2.6},
+
+        {"x": 0, "y": 3.6},
+        {"x": 1, "y": 3.35},
+        {"x": 2, "y": 3},
+        {"x": 3, "y": 3.35},
+        {"x": 4, "y": 3.7},
+        {"x": 5, "y": 2.95, "h": 1.5},
+
+        {"x": 7, "y": 2.95, "h": 1.5},
+        {"x": 8, "y": 3.7},
+        {"x": 9, "y": 3.35},
+        {"x": 10, "y": 3},
+        {"x": 11, "y": 3.35},
+        {"x": 12, "y": 3.6}
+      ]
     }
   }
 }
diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json
index 23ddc76c8d..6948e6bc44 100644
--- a/keyboards/atset/at1/info.json
+++ b/keyboards/atset/at1/info.json
@@ -17,7 +17,7 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]}
+        {"x": 0, "y": 0, "matrix": [0, 0]}
       ]
     }
   }
diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json
index 94bb71626f..c80f434460 100644
--- a/keyboards/atset/at12/info.json
+++ b/keyboards/atset/at12/info.json
@@ -17,18 +17,18 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]},
-        {"x":0, "y":3, "matrix": [3, 0]},
-        {"x":1, "y":3, "matrix": [3, 1]},
-        {"x":2, "y":3, "matrix": [3, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]},
+        {"x": 0, "y": 3, "matrix": [3, 0]},
+        {"x": 1, "y": 3, "matrix": [3, 1]},
+        {"x": 2, "y": 3, "matrix": [3, 2]}
       ]
     }
   }
diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json
index 2d5daf6ab1..abe1745e7a 100644
--- a/keyboards/atset/at16/info.json
+++ b/keyboards/atset/at16/info.json
@@ -18,22 +18,22 @@
   "layouts": {
     "LAYOUT_ortho_4x4": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":3, "y":1, "matrix": [1, 3]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]},
-        {"x":3, "y":2, "matrix": [2, 3]},
-        {"x":0, "y":3, "matrix": [3, 0]},
-        {"x":1, "y":3, "matrix": [3, 1]},
-        {"x":2, "y":3, "matrix": [3, 2]},
-        {"x":3, "y":3, "matrix": [3, 3]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 3, "y": 1, "matrix": [1, 3]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]},
+        {"x": 3, "y": 2, "matrix": [2, 3]},
+        {"x": 0, "y": 3, "matrix": [3, 0]},
+        {"x": 1, "y": 3, "matrix": [3, 1]},
+        {"x": 2, "y": 3, "matrix": [3, 2]},
+        {"x": 3, "y": 3, "matrix": [3, 3]}
       ]
     }
   }
diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json
index b34057c8fc..959bbebce8 100644
--- a/keyboards/atset/at3/info.json
+++ b/keyboards/atset/at3/info.json
@@ -17,9 +17,9 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]}
       ]
     }
   }
diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json
index bfcbafdff5..bc8c770692 100644
--- a/keyboards/atset/at6/info.json
+++ b/keyboards/atset/at6/info.json
@@ -17,12 +17,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }
diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json
index 2afafe5cef..ee263e71bb 100644
--- a/keyboards/atset/at9/info.json
+++ b/keyboards/atset/at9/info.json
@@ -17,15 +17,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index c73d93fa9d..be130dc94d 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -45,418 +45,418 @@
   "rgb_matrix": {
     "driver": "WS2812",
     "layout": [
-      { "flags": 2, "x": 224, "y": 42},
-      { "flags": 2, "x": 224, "y": 21},
-      { "flags": 2, "x": 209, "y": 21},
-      { "flags": 2, "x": 179, "y": 21},
-      { "flags": 2, "x": 164, "y": 21},
-      { "flags": 2, "x": 134, "y": 21},
-      { "flags": 2, "x": 119, "y": 21},
-      { "flags": 2, "x": 89, "y": 21},
-      { "flags": 2, "x": 74, "y": 21},
-      { "flags": 2, "x": 45, "y": 21},
-      { "flags": 2, "x": 30, "y": 21},
-      { "flags": 2, "x": 30, "y": 42},
-      { "flags": 2, "x": 30, "y": 64},
-      { "flags": 2, "x": 30, "y": 85},
-      { "flags": 2, "x": 45, "y": 85},
-      { "flags": 2, "x": 74, "y": 85},
-      { "flags": 2, "x": 89, "y": 85},
-      { "flags": 2, "x": 119, "y": 85},
-      { "flags": 2, "x": 134, "y": 85},
-      { "flags": 2, "x": 164, "y": 85},
-      { "flags": 2, "x": 179, "y": 85},
-      { "flags": 2, "x": 209, "y": 85},
-      { "flags": 2, "x": 224, "y": 85},
-      { "flags": 2, "x": 224, "y": 64}
+      {"flags": 2, "x": 224, "y": 42},
+      {"flags": 2, "x": 224, "y": 21},
+      {"flags": 2, "x": 209, "y": 21},
+      {"flags": 2, "x": 179, "y": 21},
+      {"flags": 2, "x": 164, "y": 21},
+      {"flags": 2, "x": 134, "y": 21},
+      {"flags": 2, "x": 119, "y": 21},
+      {"flags": 2, "x": 89, "y": 21},
+      {"flags": 2, "x": 74, "y": 21},
+      {"flags": 2, "x": 45, "y": 21},
+      {"flags": 2, "x": 30, "y": 21},
+      {"flags": 2, "x": 30, "y": 42},
+      {"flags": 2, "x": 30, "y": 64},
+      {"flags": 2, "x": 30, "y": 85},
+      {"flags": 2, "x": 45, "y": 85},
+      {"flags": 2, "x": 74, "y": 85},
+      {"flags": 2, "x": 89, "y": 85},
+      {"flags": 2, "x": 119, "y": 85},
+      {"flags": 2, "x": 134, "y": 85},
+      {"flags": 2, "x": 164, "y": 85},
+      {"flags": 2, "x": 179, "y": 85},
+      {"flags": 2, "x": 209, "y": 85},
+      {"flags": 2, "x": 224, "y": 85},
+      {"flags": 2, "x": 224, "y": 64}
     ]
   },
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_ansi": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_ansi_split_bs_space": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2@", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3#", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "\\|", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'\"", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'\"", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_iso": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3\u00a3", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2\"", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'@", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "#~", "matrix": [1, 14], "x": 12.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     },
     "LAYOUT_iso_split_bs_space": {
       "layout": [
-        { "label":"Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-        { "label":"1!", "matrix": [0, 1], "x": 1, "y": 0 },
-        { "label":"2\"", "matrix": [0, 2], "x": 2, "y": 0 },
-        { "label":"3\u00a3", "matrix": [0, 3], "x": 3, "y": 0 },
-        { "label":"4$", "matrix": [0, 4], "x": 4, "y": 0 },
-        { "label":"5%", "matrix": [0, 5], "x": 5, "y": 0 },
-        { "label":"6^", "matrix": [0, 6], "x": 6, "y": 0 },
-        { "label":"7&", "matrix": [0, 7], "x": 7, "y": 0 },
-        { "label":"8*", "matrix": [0, 8], "x": 8, "y": 0 },
-        { "label":"9(", "matrix": [0, 9], "x": 9, "y": 0 },
-        { "label":"0)", "matrix": [0, 10], "x": 10, "y": 0 },
-        { "label":"-_", "matrix": [0, 11], "x": 11, "y": 0 },
-        { "label":"=+", "matrix": [0, 12], "x": 12, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-        { "label":"Backspace", "matrix": [0, 14], "x": 14, "y": 0 },
-        { "label":"RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0 },
+        {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "2\"", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "3\u00a3", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+        {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+        {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+        {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0},
+        {"label": "RGB Toggle", "matrix": [0, 15], "x": 15.25, "y": 0},
 
-        { "label":"Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-        { "label":"Q", "matrix": [1, 2], "x": 1.5, "y": 1 },
-        { "label":"W", "matrix": [1, 3], "x": 2.5, "y": 1 },
-        { "label":"E", "matrix": [1, 4], "x": 3.5, "y": 1 },
-        { "label":"R", "matrix": [1, 5], "x": 4.5, "y": 1 },
-        { "label":"T", "matrix": [1, 6], "x": 5.5, "y": 1 },
-        { "label":"Y", "matrix": [1, 7], "x": 6.5, "y": 1 },
-        { "label":"U", "matrix": [1, 8], "x": 7.5, "y": 1 },
-        { "label":"I", "matrix": [1, 9], "x": 8.5, "y": 1 },
-        { "label":"O", "matrix": [1, 10], "x": 9.5, "y": 1 },
-        { "label":"P", "matrix": [1, 11], "x": 10.5, "y": 1 },
-        { "label":"[{", "matrix": [1, 12], "x": 11.5, "y": 1 },
-        { "label":"]}", "matrix": [1, 13], "x": 12.5, "y": 1 },
-        { "label":"RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1 },
+        {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"label": "Q", "matrix": [1, 2], "x": 1.5, "y": 1},
+        {"label": "W", "matrix": [1, 3], "x": 2.5, "y": 1},
+        {"label": "E", "matrix": [1, 4], "x": 3.5, "y": 1},
+        {"label": "R", "matrix": [1, 5], "x": 4.5, "y": 1},
+        {"label": "T", "matrix": [1, 6], "x": 5.5, "y": 1},
+        {"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 1},
+        {"label": "U", "matrix": [1, 8], "x": 7.5, "y": 1},
+        {"label": "I", "matrix": [1, 9], "x": 8.5, "y": 1},
+        {"label": "O", "matrix": [1, 10], "x": 9.5, "y": 1},
+        {"label": "P", "matrix": [1, 11], "x": 10.5, "y": 1},
+        {"label": "[{", "matrix": [1, 12], "x": 11.5, "y": 1},
+        {"label": "]}", "matrix": [1, 13], "x": 12.5, "y": 1},
+        {"label": "RGB Mode", "matrix": [1, 15], "x": 15.25, "y": 1},
 
-        { "label":"Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-        { "label":"A", "matrix": [2, 2], "x": 1.75, "y": 2 },
-        { "label":"S", "matrix": [2, 3], "x": 2.75, "y": 2 },
-        { "label":"D", "matrix": [2, 4], "x": 3.75, "y": 2 },
-        { "label":"F", "matrix": [2, 5], "x": 4.75, "y": 2 },
-        { "label":"G", "matrix": [2, 6], "x": 5.75, "y": 2 },
-        { "label":"H", "matrix": [2, 7], "x": 6.75, "y": 2 },
-        { "label":"J", "matrix": [2, 8], "x": 7.75, "y": 2 },
-        { "label":"K", "matrix": [2, 9], "x": 8.75, "y": 2 },
-        { "label":"L", "matrix": [2, 10], "x": 9.75, "y": 2 },
-        { "label":";:", "matrix": [2, 11], "x": 10.75, "y": 2 },
-        { "label":"'@", "matrix": [2, 12], "x": 11.75, "y": 2 },
-        { "label":"#~", "matrix": [1, 14], "x": 12.75, "y": 2 },
-        { "label":"Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-        { "label":"Fn", "matrix": [2, 15], "x": 15.25, "y": 2 },
+        {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"label": "A", "matrix": [2, 2], "x": 1.75, "y": 2},
+        {"label": "S", "matrix": [2, 3], "x": 2.75, "y": 2},
+        {"label": "D", "matrix": [2, 4], "x": 3.75, "y": 2},
+        {"label": "F", "matrix": [2, 5], "x": 4.75, "y": 2},
+        {"label": "G", "matrix": [2, 6], "x": 5.75, "y": 2},
+        {"label": "H", "matrix": [2, 7], "x": 6.75, "y": 2},
+        {"label": "J", "matrix": [2, 8], "x": 7.75, "y": 2},
+        {"label": "K", "matrix": [2, 9], "x": 8.75, "y": 2},
+        {"label": "L", "matrix": [2, 10], "x": 9.75, "y": 2},
+        {"label": ";:", "matrix": [2, 11], "x": 10.75, "y": 2},
+        {"label": "'@", "matrix": [2, 12], "x": 11.75, "y": 2},
+        {"label": "#~", "matrix": [1, 14], "x": 12.75, "y": 2},
+        {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+        {"label": "Fn", "matrix": [2, 15], "x": 15.25, "y": 2},
 
-        { "label":"Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25 },
-        { "label":"\\|", "matrix": [3, 0], "x": 1.25, "y": 3 },
-        { "label":"Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
-        { "label":"X", "matrix": [3, 3], "x": 3.25, "y": 3 },
-        { "label":"C", "matrix": [3, 4], "x": 4.25, "y": 3 },
-        { "label":"V", "matrix": [3, 5], "x": 5.25, "y": 3 },
-        { "label":"B", "matrix": [3, 6], "x": 6.25, "y": 3 },
-        { "label":"N", "matrix": [3, 7], "x": 7.25, "y": 3 },
-        { "label":"M", "matrix": [3, 8], "x": 8.25, "y": 3 },
-        { "label":",<", "matrix": [3, 9], "x": 9.25, "y": 3 },
-        { "label":".>", "matrix": [3, 10], "x": 10.25, "y": 3 },
-        { "label":"/?", "matrix": [3, 11], "x": 11.25, "y": 3 },
-        { "label":"Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75 },
-        { "label":"\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25 },
+        {"label": "Shift", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.25},
+        {"label": "\\|", "matrix": [3, 0], "x": 1.25, "y": 3},
+        {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+        {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+        {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+        {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+        {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+        {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+        {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+        {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+        {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+        {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+        {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+        {"label": "\u2191", "matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-        { "label":"Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-        { "label":"GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-        { "label":"Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25 },
-        { "label":"Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25 },
-        { "label":"Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75 },
-        { "label":"Alt", "matrix": [4, 10], "x": 10, "y": 4 },
-        { "label":"Ctrl", "matrix": [4, 11], "x": 11, "y": 4 },
-        { "label":"`~", "matrix": [4, 12], "x": 12, "y": 4 },
-        { "label":"\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25 },
-        { "label":"\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25 },
-        { "label":"\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25 }
+        {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+        {"label": "Space", "matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+        {"label": "Space", "matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+        {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4},
+        {"label": "Ctrl", "matrix": [4, 11], "x": 11, "y": 4},
+        {"label": "`~", "matrix": [4, 12], "x": 12, "y": 4},
+        {"label": "\u2190", "matrix": [4, 13], "x": 13.25, "y": 4.25},
+        {"label": "\u2193", "matrix": [4, 14], "x": 14.25, "y": 4.25},
+        {"label": "\u2192", "matrix": [4, 15], "x": 15.25, "y": 4.25}
       ]
     }
   }
diff --git a/keyboards/bpiphany/pegasushoof/2013/info.json b/keyboards/bpiphany/pegasushoof/2013/info.json
index 82995aa27d..585d417688 100644
--- a/keyboards/bpiphany/pegasushoof/2013/info.json
+++ b/keyboards/bpiphany/pegasushoof/2013/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "Majestouch TKL \\\\w The Pegasus Hoof 2013",
     "diode_direction": "COL2ROW",
     "indicators": {
-        "caps_lock" : "C6",
+        "caps_lock": "C6",
         "scroll_lock": "C5",
         "on_state": 0
     },
diff --git a/keyboards/bpiphany/pegasushoof/2015/info.json b/keyboards/bpiphany/pegasushoof/2015/info.json
index 592128a6b2..bed39668e8 100644
--- a/keyboards/bpiphany/pegasushoof/2015/info.json
+++ b/keyboards/bpiphany/pegasushoof/2015/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "Majestouch TKL The Pegasus Hoof 2015",
     "diode_direction": "COL2ROW",
     "indicators": {
-        "caps_lock" : "C6",
+        "caps_lock": "C6",
         "scroll_lock": "C5",
         "on_state": 0
     },
diff --git a/keyboards/bpiphany/sixshooter/info.json b/keyboards/bpiphany/sixshooter/info.json
index a6ab63f6ae..9705eb2f18 100644
--- a/keyboards/bpiphany/sixshooter/info.json
+++ b/keyboards/bpiphany/sixshooter/info.json
@@ -19,12 +19,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }
diff --git a/keyboards/buildakb/potato65s/info.json b/keyboards/buildakb/potato65s/info.json
index c9239bede4..baa8f3ec59 100644
--- a/keyboards/buildakb/potato65s/info.json
+++ b/keyboards/buildakb/potato65s/info.json
@@ -12,30 +12,8 @@
         "pin": "D5"
     },
     "matrix_pins": {
-        "cols": [
-            "D3",
-            "D4",
-            "D6",
-            "D7",
-            "B4",
-            "B5",
-            "B6",
-            "F1",
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "B7",
-            "D0",
-            "D1"
-        ],
-        "rows": [
-            "F5",
-            "F4",
-            "F6",
-            "F0",
-            "D2"
-        ]
+        "cols": ["D3", "D4", "D6", "D7", "B4", "B5", "B6", "F1", "B0", "B1", "B2", "B3", "B7", "D0", "D1"],
+        "rows": ["F5", "F4", "F6", "F0", "D2"]
     },
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
@@ -52,77 +30,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_split_bs": {
@@ -203,151 +181,151 @@
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
-                { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
-                { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
-                { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
-                { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
-                { "label": "-", "matrix": [0, 11], "x": 11, "y": 0 },
-                { "label": "=", "matrix": [0, 12], "x": 12, "y": 0 },
-                { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0 },
-                { "label": "Delete", "matrix": [2, 12], "x": 14, "y": 0 },
-                { "label": "Home", "matrix": [0, 14], "x": 15, "y": 0 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [2, 12], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 15, "y": 0},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "label": "[", "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "label": "]", "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "Page Up", "matrix": [1, 14], "x": 15, "y": 1},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "label": ";", "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "label": "'", "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Down", "matrix": [2, 14], "x": 15, "y": 2},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 },
-                { "label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "label": "X", "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "label": "C", "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "label": "B", "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "label": "N", "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "label": "M", "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "label": ",", "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "label": ".", "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "label": "/", "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3 },
-                { "label": "End", "matrix": [3, 14], "x": 15, "y": 3 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 14, "y": 3},
+                {"label": "End", "matrix": [3, 14], "x": 15, "y": 3},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5 },
-                { "label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5 },
-                { "label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7 },
-                { "label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5 },
-                { "label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4 },
-                { "label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4 },
-                { "label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 12], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [4, 13], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/info.json
index 61a7ccb56c..d272b35a0f 100644
--- a/keyboards/cannonkeys/db60/hotswap/info.json
+++ b/keyboards/cannonkeys/db60/hotswap/info.json
@@ -7,214 +7,214 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 6]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/info.json
index a08f843483..0778b604ff 100644
--- a/keyboards/cannonkeys/db60/j02/info.json
+++ b/keyboards/cannonkeys/db60/j02/info.json
@@ -7,284 +7,284 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 5]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 5]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":1, "w":1.25, "h":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/info.json
index fb76e2d6c3..dc45ffecd5 100644
--- a/keyboards/cannonkeys/db60/rev2/info.json
+++ b/keyboards/cannonkeys/db60/rev2/info.json
@@ -7,284 +7,284 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "w":2.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 6]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "matrix": [4, 12]},
-                {"x":13.5, "y":4, "w":1.5, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "matrix": [4, 12]},
+                {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":1, "w":1.25, "h":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":2.75, "matrix": [3, 12]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "matrix": [0, 13]},
-                {"x":14, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "matrix": [0, 13]},
+                {"x": 14, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "matrix": [3, 3]},
-                {"x":4.25, "y":3, "matrix": [3, 4]},
-                {"x":5.25, "y":3, "matrix": [3, 5]},
-                {"x":6.25, "y":3, "matrix": [3, 6]},
-                {"x":7.25, "y":3, "matrix": [3, 7]},
-                {"x":8.25, "y":3, "matrix": [3, 8]},
-                {"x":9.25, "y":3, "matrix": [3, 9]},
-                {"x":10.25, "y":3, "matrix": [3, 10]},
-                {"x":11.25, "y":3, "matrix": [3, 11]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 12]},
-                {"x":14, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "matrix": [3, 3]},
+                {"x": 4.25, "y": 3, "matrix": [3, 4]},
+                {"x": 5.25, "y": 3, "matrix": [3, 5]},
+                {"x": 6.25, "y": 3, "matrix": [3, 6]},
+                {"x": 7.25, "y": 3, "matrix": [3, 7]},
+                {"x": 8.25, "y": 3, "matrix": [3, 8]},
+                {"x": 9.25, "y": 3, "matrix": [3, 9]},
+                {"x": 10.25, "y": 3, "matrix": [3, 10]},
+                {"x": 11.25, "y": 3, "matrix": [3, 11]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+                {"x": 14, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 6]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 11]},
-                {"x":12.5, "y":4, "w":1.25, "matrix": [4, 12]},
-                {"x":13.75, "y":4, "w":1.25, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json
index 231f636853..ab3a2d765d 100644
--- a/keyboards/cannonkeys/nearfield/info.json
+++ b/keyboards/cannonkeys/nearfield/info.json
@@ -1,12 +1,12 @@
 {
-    "keyboard_name":"Nearfield",
-    "manufacturer":"JLC",
-    "url":"",
-    "maintainer":"tominabox1",
-    "usb":{
-       "vid":"0x0004",
-       "pid":"0x0002",
-       "device_version":"0.0.1"
+    "keyboard_name": "Nearfield",
+    "manufacturer": "JLC",
+    "url": "",
+    "maintainer": "tominabox1",
+    "usb": {
+       "vid": "0x0004",
+       "pid": "0x0002",
+       "device_version": "0.0.1"
     },
     "matrix_pins": {
        "cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"],
@@ -107,80 +107,80 @@
         },
         "LAYOUT_3u_space": {
             "layout": [
-                { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
-                { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
-                { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
-                { "label": "^", "matrix": [0, 6], "x": 7.5, "y": 0 },
-                { "label": "&", "matrix": [0, 7], "x": 8.5, "y": 0 },
-                { "label": "*", "matrix": [0, 8], "x": 9.5, "y": 0 },
-                { "label": "(", "matrix": [0, 9], "x": 10.5, "y": 0 },
-                { "label": ")", "matrix": [0, 10], "x": 11.5, "y": 0 },
-                { "label": "_", "matrix": [0, 11], "x": 12.5, "y": 0 },
-                { "label": "+", "matrix": [0, 12], "x": 13.5, "y": 0 },
-                { "label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0 },
-                { "label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0 },
-                { "label": "PgUp", "matrix": [0, 15], "x": 17.5, "y": 0 },
-
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5 },
-                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5 },
-                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.5 },
-                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1.5 },
-                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.5 },
-                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.5 },
-                { "label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5 },
-                { "label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5 },
-                { "label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5 },
-                { "label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5 },
-                { "label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5 },
-                { "label": "{ ", "matrix": [1, 11], "x": 12.5, "y": 1.5 },
-                { "label": " }", "matrix": [1, 12], "x": 13.5, "y": 1.5 },
-                { "label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5 },
-                { "label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5 },
-                { "label": "PgUp", "matrix": [1, 15], "x": 17.5, "y": 1.5 },
-
-                { "label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25 },
-                { "label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5 },
-                { "label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5 },
-                { "label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5 },
-                { "label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5 },
-                { "label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5 },
-                { "label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5 },
-                { "label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5 },
-                { "label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5 },
-                { "label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5 },
-                { "label": "\"", "matrix": [2, 10], "x": 11.75, "y": 2.5 },
-                { "label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75 },
-                { "label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5 },
-                { "label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5 },
-                { "label": "PgDn", "matrix": [2, 15], "x": 17.5, "y": 2.5 },
-
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5 },
-                { "label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
-                { "label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5 },
-                { "label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5 },
-                { "label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5 },
-                { "label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5 },
-                { "label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5 },
-                { "label": "<", "matrix": [3, 8], "x": 10.25, "y": 3.5 },
-                { "label": ">", "matrix": [3, 9], "x": 11.25, "y": 3.5 },
-                { "label": "?", "matrix": [3, 10], "x": 12.25, "y": 3.5 },
-                { "label": "r4 dogshift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25 },
-
-                { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25 },
-                { "label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25 },
-                { "label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 3 },
-                { "label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25 },
-                { "label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25 },
-                { "label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5 },
-                { "label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5 },
-
-                { "label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5 },
-                { "label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5 },
-                { "label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5 }
+                {"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "^", "matrix": [0, 6], "x": 7.5, "y": 0},
+                {"label": "&", "matrix": [0, 7], "x": 8.5, "y": 0},
+                {"label": "*", "matrix": [0, 8], "x": 9.5, "y": 0},
+                {"label": "(", "matrix": [0, 9], "x": 10.5, "y": 0},
+                {"label": ")", "matrix": [0, 10], "x": 11.5, "y": 0},
+                {"label": "_", "matrix": [0, 11], "x": 12.5, "y": 0},
+                {"label": "+", "matrix": [0, 12], "x": 13.5, "y": 0},
+                {"label": "Insert", "matrix": [0, 13], "x": 15.5, "y": 0},
+                {"label": "Home", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "PgUp", "matrix": [0, 15], "x": 17.5, "y": 0},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "Y", "matrix": [1, 6], "x": 7.5, "y": 1.5},
+                {"label": "U", "matrix": [1, 7], "x": 8.5, "y": 1.5},
+                {"label": "I", "matrix": [1, 8], "x": 9.5, "y": 1.5},
+                {"label": "O", "matrix": [1, 9], "x": 10.5, "y": 1.5},
+                {"label": "P", "matrix": [1, 10], "x": 11.5, "y": 1.5},
+                {"label": "{", "matrix": [1, 11], "x": 12.5, "y": 1.5},
+                {"label": "}", "matrix": [1, 12], "x": 13.5, "y": 1.5},
+                {"label": "Insert", "matrix": [1, 13], "x": 15.5, "y": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 16.5, "y": 1.5},
+                {"label": "PgUp", "matrix": [1, 15], "x": 17.5, "y": 1.5},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25},
+                {"label": "A", "matrix": [2, 1], "x": 1.25, "y": 2.5},
+                {"label": "S", "matrix": [2, 2], "x": 2.25, "y": 2.5},
+                {"label": "D", "matrix": [2, 3], "x": 3.25, "y": 2.5},
+                {"label": "F", "matrix": [2, 4], "x": 4.25, "y": 2.5},
+                {"label": "G", "matrix": [2, 5], "x": 5.25, "y": 2.5},
+                {"label": "H", "matrix": [2, 6], "x": 7.75, "y": 2.5},
+                {"label": "J", "matrix": [2, 7], "x": 8.75, "y": 2.5},
+                {"label": "K", "matrix": [2, 8], "x": 9.75, "y": 2.5},
+                {"label": "L", "matrix": [2, 9], "x": 10.75, "y": 2.5},
+                {"label": "\"", "matrix": [2, 10], "x": 11.75, "y": 2.5},
+                {"label": "Enter", "matrix": [2, 11], "x": 12.75, "y": 2.5, "w": 1.75},
+                {"label": "Delete", "matrix": [2, 13], "x": 15.5, "y": 2.5},
+                {"label": "End", "matrix": [2, 14], "x": 16.5, "y": 2.5},
+                {"label": "PgDn", "matrix": [2, 15], "x": 17.5, "y": 2.5},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "Z", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "X", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "C", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "V", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "B", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "N", "matrix": [3, 6], "x": 8.25, "y": 3.5},
+                {"label": "M", "matrix": [3, 7], "x": 9.25, "y": 3.5},
+                {"label": "<", "matrix": [3, 8], "x": 10.25, "y": 3.5},
+                {"label": ">", "matrix": [3, 9], "x": 11.25, "y": 3.5},
+                {"label": "?", "matrix": [3, 10], "x": 12.25, "y": 3.5},
+                {"label": "r4 dogshift", "matrix": [3, 11], "x": 13.25, "y": 3.5, "w": 1.25},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 1], "x": 2.5, "y": 4.5, "w": 1.25},
+                {"label": "Space", "matrix": [4, 3], "x": 3.75, "y": 4.5, "w": 3},
+                {"label": "Space", "matrix": [4, 6], "x": 8.25, "y": 4.5, "w": 2.25},
+                {"label": "Alt", "matrix": [4, 8], "x": 10.5, "y": 4.5, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 10], "x": 13, "y": 4.5, "w": 1.5},
+                {"label": "\u2191", "matrix": [4, 12], "x": 16.5, "y": 4.5},
+
+                {"label": "\u2190", "matrix": [4, 13], "x": 15.5, "y": 5.5},
+                {"label": "\u2193", "matrix": [4, 14], "x": 16.5, "y": 5.5},
+                {"label": "\u2192", "matrix": [4, 15], "x": 17.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/info.json
index be9e5349cd..4ead7db042 100644
--- a/keyboards/cannonkeys/ortho48v2/info.json
+++ b/keyboards/cannonkeys/ortho48v2/info.json
@@ -42,54 +42,54 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back Space", "x":11, "y":0, "matrix": [0, 11]},
-                {"label":"Esc", "x":0, "y":1, "matrix": [1, 0]},
-                {"label":"A", "x":1, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9, "y":1, "matrix": [1, 9]},
-                {"label":";", "x":10, "y":1, "matrix": [1, 10]},
-                {"label":"'", "x":11, "y":1, "matrix": [1, 11]},
-                {"label":"Shift", "x":0, "y":2, "matrix": [2, 0]},
-                {"label":"Z", "x":1, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8, "y":2, "matrix": [2, 8]},
-                {"label":".", "x":9, "y":2, "matrix": [2, 9]},
-                {"label":"/", "x":10, "y":2, "matrix": [2, 10]},
-                {"label":"Return", "x":11, "y":2, "matrix": [2, 11]},
-                {"label":"", "x":0, "y":3, "matrix": [3, 0]},
-                {"label":"Ctrl", "x":1, "y":3, "matrix": [3, 1]},
-                {"label":"Alt", "x":2, "y":3, "matrix": [3, 2]},
-                {"label":"Super", "x":3, "y":3, "matrix": [3, 3]},
-                {"label":"&dArr;", "x":4, "y":3, "matrix": [3, 4]},
-                {"label":"", "x":5, "y":3, "matrix": [3, 5]},
-                {"label":"", "x":6, "y":3, "matrix": [3, 6]},
-                {"label":"&uArr;", "x":7, "y":3, "matrix": [3, 7]},
-                {"label":"&larr;", "x":8, "y":3, "matrix": [3, 8]},
-                {"label":"&darr;", "x":9, "y":3, "matrix": [3, 9]},
-                {"label":"&uarr;", "x":10, "y":3, "matrix": [3, 10]},
-                {"label":"&rarr;", "x":11, "y":3, "matrix": [3, 11]}]
+                {"label": "Tab", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back Space", "x": 11, "y": 0, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 1, "matrix": [1, 0]},
+                {"label": "A", "x": 1, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9, "y": 1, "matrix": [1, 9]},
+                {"label": ";", "x": 10, "y": 1, "matrix": [1, 10]},
+                {"label": "'", "x": 11, "y": 1, "matrix": [1, 11]},
+                {"label": "Shift", "x": 0, "y": 2, "matrix": [2, 0]},
+                {"label": "Z", "x": 1, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8, "y": 2, "matrix": [2, 8]},
+                {"label": ".", "x": 9, "y": 2, "matrix": [2, 9]},
+                {"label": "/", "x": 10, "y": 2, "matrix": [2, 10]},
+                {"label": "Return", "x": 11, "y": 2, "matrix": [2, 11]},
+                {"label": "", "x": 0, "y": 3, "matrix": [3, 0]},
+                {"label": "Ctrl", "x": 1, "y": 3, "matrix": [3, 1]},
+                {"label": "Alt", "x": 2, "y": 3, "matrix": [3, 2]},
+                {"label": "Super", "x": 3, "y": 3, "matrix": [3, 3]},
+                {"label": "&dArr;", "x": 4, "y": 3, "matrix": [3, 4]},
+                {"label": "", "x": 5, "y": 3, "matrix": [3, 5]},
+                {"label": "", "x": 6, "y": 3, "matrix": [3, 6]},
+                {"label": "&uArr;", "x": 7, "y": 3, "matrix": [3, 7]},
+                {"label": "&larr;", "x": 8, "y": 3, "matrix": [3, 8]},
+                {"label": "&darr;", "x": 9, "y": 3, "matrix": [3, 9]},
+                {"label": "&uarr;", "x": 10, "y": 3, "matrix": [3, 10]},
+                {"label": "&rarr;", "x": 11, "y": 3, "matrix": [3, 11]}]
         }
     }
 }
diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json
index 8cd498e2ae..34b4e3c95e 100644
--- a/keyboards/capsunlocked/cu80/v1/info.json
+++ b/keyboards/capsunlocked/cu80/v1/info.json
@@ -125,7 +125,7 @@
                 {"matrix": [5, 16], "x": 17.25, "y": 5.5}
             ]
         },
-        "LAYOUT_tkl_ansi":{
+        "LAYOUT_tkl_ansi": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
 
diff --git a/keyboards/citrus/erdnuss65/info.json b/keyboards/citrus/erdnuss65/info.json
index 749091f43b..44d597ffb4 100644
--- a/keyboards/citrus/erdnuss65/info.json
+++ b/keyboards/citrus/erdnuss65/info.json
@@ -10,10 +10,8 @@
         "device_version": "0.0.1"
     },
     "matrix_pins": {
-        "rows":
-        ["B10", "B1", "B0", "A7", "A6"],
-        "cols":
-        ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
+        "rows": ["B10", "B1", "B0", "A7", "A6"],
+        "cols": ["B12", "B14", "B15", "A8", "B13", "B3", "B4", "B5", "A1", "A2", "A0", "A3", "A4", "A5", "B11"]
     },
     "diode_direction": "COL2ROW",
     "features": {
diff --git a/keyboards/coban/pad3a/info.json b/keyboards/coban/pad3a/info.json
index f1b9053fc9..70871d0434 100644
--- a/keyboards/coban/pad3a/info.json
+++ b/keyboards/coban/pad3a/info.json
@@ -19,9 +19,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Mute", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Next", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"Push", "x":3, "y":0, "matrix": [0, 2]},
+                {"label": "Mute", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Next", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "Push", "x": 3, "y": 0, "matrix": [0, 2]},
             ]
         }
     }
diff --git a/keyboards/contra/info.json b/keyboards/contra/info.json
index 512d9063ce..ffa32d6555 100644
--- a/keyboards/contra/info.json
+++ b/keyboards/contra/info.json
@@ -25,111 +25,111 @@
   "layouts": {
     "LAYOUT_ortho_4x12": {
       "layout": [
-        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
-        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
-        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
-        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
-        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
-        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
-        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
-        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
-        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
-        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
-        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
-        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+        {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0},
 
-        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
-        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
-        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
-        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
-        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
-        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
-        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
-        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
-        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
-        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
-        {"label":";", "matrix": [1, 10], "x":10, "y":1},
-        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+        {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1},
+        {"label": "A", "matrix": [1, 1], "x": 1, "y": 1},
+        {"label": "S", "matrix": [1, 2], "x": 2, "y": 1},
+        {"label": "D", "matrix": [1, 3], "x": 3, "y": 1},
+        {"label": "F", "matrix": [1, 4], "x": 4, "y": 1},
+        {"label": "G", "matrix": [1, 5], "x": 5, "y": 1},
+        {"label": "H", "matrix": [1, 6], "x": 6, "y": 1},
+        {"label": "J", "matrix": [1, 7], "x": 7, "y": 1},
+        {"label": "K", "matrix": [1, 8], "x": 8, "y": 1},
+        {"label": "L", "matrix": [1, 9], "x": 9, "y": 1},
+        {"label": ";", "matrix": [1, 10], "x": 10, "y": 1},
+        {"label": "'", "matrix": [1, 11], "x": 11, "y": 1},
 
-        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
-        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
-        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
-        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
-        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
-        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
-        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
-        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
-        {"label":",", "matrix": [2, 8], "x":8, "y":2},
-        {"label":".", "matrix": [2, 9], "x":9, "y":2},
-        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
-        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+        {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
+        {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
+        {"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
+        {"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
+        {"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
+        {"label": "N", "matrix": [2, 6], "x": 6, "y": 2},
+        {"label": "M", "matrix": [2, 7], "x": 7, "y": 2},
+        {"label": ",", "matrix": [2, 8], "x": 8, "y": 2},
+        {"label": ".", "matrix": [2, 9], "x": 9, "y": 2},
+        {"label": "/", "matrix": [2, 10], "x": 10, "y": 2},
+        {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2},
 
-        {"matrix": [3, 0], "x":0, "y":3},
-        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
-        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
-        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
-        {"label":"&dArr;", "matrix": [3, 4], "x":4, "y":3},
-        {"matrix": [3, 5], "x":5, "y":3},
-        {"matrix": [3, 6], "x":6, "y":3},
-        {"label":"&uArr;", "matrix": [3, 7], "x":7, "y":3},
-        {"label":"&larr;", "matrix": [3, 8], "x":8, "y":3},
-        {"label":"&darr;", "matrix": [3, 9], "x":9, "y":3},
-        {"label":"&uarr;", "matrix": [3, 10], "x":10, "y":3},
-        {"label":"&rarr;", "matrix": [3, 11], "x":11, "y":3}
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3},
+        {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3},
+        {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3},
+        {"label": "&dArr;", "matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"label": "&uArr;", "matrix": [3, 7], "x": 7, "y": 3},
+        {"label": "&larr;", "matrix": [3, 8], "x": 8, "y": 3},
+        {"label": "&darr;", "matrix": [3, 9], "x": 9, "y": 3},
+        {"label": "&uarr;", "matrix": [3, 10], "x": 10, "y": 3},
+        {"label": "&rarr;", "matrix": [3, 11], "x": 11, "y": 3}
       ]
     },
     "LAYOUT_planck_mit": {
       "layout": [
-        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
-        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
-        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
-        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
-        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
-        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
-        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
-        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
-        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
-        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
-        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
-        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+        {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0},
+        {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+        {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+        {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+        {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+        {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+        {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+        {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+        {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+        {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+        {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+        {"label": "BackSpace", "matrix": [0, 11], "x": 11, "y": 0},
 
-        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
-        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
-        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
-        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
-        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
-        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
-        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
-        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
-        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
-        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
-        {"label":";", "matrix": [1, 10], "x":10, "y":1},
-        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+        {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1},
+        {"label": "A", "matrix": [1, 1], "x": 1, "y": 1},
+        {"label": "S", "matrix": [1, 2], "x": 2, "y": 1},
+        {"label": "D", "matrix": [1, 3], "x": 3, "y": 1},
+        {"label": "F", "matrix": [1, 4], "x": 4, "y": 1},
+        {"label": "G", "matrix": [1, 5], "x": 5, "y": 1},
+        {"label": "H", "matrix": [1, 6], "x": 6, "y": 1},
+        {"label": "J", "matrix": [1, 7], "x": 7, "y": 1},
+        {"label": "K", "matrix": [1, 8], "x": 8, "y": 1},
+        {"label": "L", "matrix": [1, 9], "x": 9, "y": 1},
+        {"label": ";", "matrix": [1, 10], "x": 10, "y": 1},
+        {"label": "'", "matrix": [1, 11], "x": 11, "y": 1},
 
-        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
-        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
-        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
-        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
-        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
-        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
-        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
-        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
-        {"label":",", "matrix": [2, 8], "x":8, "y":2},
-        {"label":".", "matrix": [2, 9], "x":9, "y":2},
-        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
-        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+        {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
+        {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
+        {"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
+        {"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
+        {"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
+        {"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
+        {"label": "N", "matrix": [2, 6], "x": 6, "y": 2},
+        {"label": "M", "matrix": [2, 7], "x": 7, "y": 2},
+        {"label": ",", "matrix": [2, 8], "x": 8, "y": 2},
+        {"label": ".", "matrix": [2, 9], "x": 9, "y": 2},
+        {"label": "/", "matrix": [2, 10], "x": 10, "y": 2},
+        {"label": "Return", "matrix": [2, 11], "x": 11, "y": 2},
 
-        {"matrix": [3, 0], "x":0, "y":3},
-        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
-        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
-        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
-        {"label":"&dArr;", "matrix": [3, 4], "x":4, "y":3},
-        {"matrix": [3, 5], "x":5, "y":3},
-        {"label":"&uArr;", "matrix": [3, 7], "x":7, "y":3},
-        {"label":"&larr;", "matrix": [3, 8], "x":8, "y":3},
-        {"label":"&darr;", "matrix": [3, 9], "x":9, "y":3},
-        {"label":"&uarr;", "matrix": [3, 10], "x":10, "y":3},
-        {"label":"&rarr;", "matrix": [3, 11], "x":11, "y":3}
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3},
+        {"label": "Alt", "matrix": [3, 2], "x": 2, "y": 3},
+        {"label": "Super", "matrix": [3, 3], "x": 3, "y": 3},
+        {"label": "&dArr;", "matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"label": "&uArr;", "matrix": [3, 7], "x": 7, "y": 3},
+        {"label": "&larr;", "matrix": [3, 8], "x": 8, "y": 3},
+        {"label": "&darr;", "matrix": [3, 9], "x": 9, "y": 3},
+        {"label": "&uarr;", "matrix": [3, 10], "x": 10, "y": 3},
+        {"label": "&rarr;", "matrix": [3, 11], "x": 11, "y": 3}
       ]
     }
   }
diff --git a/keyboards/controllerworks/mini36/info.json b/keyboards/controllerworks/mini36/info.json
index c9884953c6..dcab8a1b97 100644
--- a/keyboards/controllerworks/mini36/info.json
+++ b/keyboards/controllerworks/mini36/info.json
@@ -13,7 +13,7 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "build": {
-        "lto":true
+        "lto": true
     },
     "matrix_pins": {
         "direct": [
@@ -57,96 +57,96 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            { "flags": 2, "x": 71, "y": 4 },
-            { "flags": 2, "x": 32, "y": 2 },
-            { "flags": 2, "x": 0, "y": 24 },
-            { "flags": 2, "x": 16, "y": 51 },
-            { "flags": 2, "x": 63, "y": 58 },
-            { "flags": 2, "x": 94, "y": 55 },
-            { "flags": 1, "matrix": [3, 2], "x": 90, "y": 64 },
-            { "flags": 4, "matrix": [2, 4], "x": 79, "y": 39 },
-            { "flags": 4, "matrix": [1, 4], "x": 79, "y": 22 },
-            { "flags": 4, "matrix": [0, 4], "x": 79, "y": 5 },
-            { "flags": 4, "matrix": [0, 3], "x": 61, "y": 2 },
-            { "flags": 4, "matrix": [1, 3], "x": 61, "y": 19 },
-            { "flags": 4, "matrix": [2, 3], "x": 61, "y": 37 },
-            { "flags": 1, "matrix": [3, 1], "x": 74, "y": 58 },
-            { "flags": 1, "matrix": [3, 0], "x": 53, "y": 55 },
-            { "flags": 4, "matrix": [2, 2], "x": 43, "y": 34 },
-            { "flags": 4, "matrix": [1, 2], "x": 43, "y": 17 },
-            { "flags": 4, "matrix": [0, 2], "x": 43, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 25, "y": 2 },
-            { "flags": 4, "matrix": [1, 1], "x": 25, "y": 19 },
-            { "flags": 4, "matrix": [2, 1], "x": 25, "y": 37 },
-            { "flags": 4, "matrix": [2, 0], "x": 7, "y": 41 },
-            { "flags": 4, "matrix": [1, 0], "x": 7, "y": 24 },
-            { "flags": 4, "matrix": [0, 0], "x": 7, "y": 7 },
-            { "flags": 2, "x": 153, "y": 4 },
-            { "flags": 2, "x": 192, "y": 2 },
-            { "flags": 2, "x": 224, "y": 24 },
-            { "flags": 2, "x": 204, "y": 53 },
-            { "flags": 2, "x": 161, "y": 57 },
-            { "flags": 2, "x": 130, "y": 55 },
-            { "flags": 1, "matrix": [7, 0], "x": 134, "y": 64 },
-            { "flags": 4, "matrix": [6, 0], "x": 145, "y": 39 },
-            { "flags": 4, "matrix": [5, 0], "x": 145, "y": 22 },
-            { "flags": 4, "matrix": [4, 0], "x": 145, "y": 5 },
-            { "flags": 4, "matrix": [4, 1], "x": 163, "y": 2 },
-            { "flags": 4, "matrix": [5, 1], "x": 163, "y": 19 },
-            { "flags": 4, "matrix": [6, 1], "x": 163, "y": 37 },
-            { "flags": 1, "matrix": [7, 1], "x": 150, "y": 58 },
-            { "flags": 1, "matrix": [7, 2], "x": 171, "y": 55 },
-            { "flags": 4, "matrix": [6, 2], "x": 181, "y": 34 },
-            { "flags": 4, "matrix": [5, 2], "x": 181, "y": 17 },
-            { "flags": 4, "matrix": [4, 2], "x": 181, "y": 0 },
-            { "flags": 4, "matrix": [4, 3], "x": 199, "y": 2 },
-            { "flags": 4, "matrix": [5, 3], "x": 199, "y": 19 },
-            { "flags": 4, "matrix": [6, 3], "x": 199, "y": 37 },
-            { "flags": 4, "matrix": [6, 4], "x": 217, "y": 41 },
-            { "flags": 4, "matrix": [5, 4], "x": 217, "y": 24 },
-            { "flags": 4, "matrix": [4, 4], "x": 217, "y": 7 }
+            {"flags": 2, "x": 71, "y": 4},
+            {"flags": 2, "x": 32, "y": 2},
+            {"flags": 2, "x": 0, "y": 24},
+            {"flags": 2, "x": 16, "y": 51},
+            {"flags": 2, "x": 63, "y": 58},
+            {"flags": 2, "x": 94, "y": 55},
+            {"flags": 1, "matrix": [3, 2], "x": 90, "y": 64},
+            {"flags": 4, "matrix": [2, 4], "x": 79, "y": 39},
+            {"flags": 4, "matrix": [1, 4], "x": 79, "y": 22},
+            {"flags": 4, "matrix": [0, 4], "x": 79, "y": 5},
+            {"flags": 4, "matrix": [0, 3], "x": 61, "y": 2},
+            {"flags": 4, "matrix": [1, 3], "x": 61, "y": 19},
+            {"flags": 4, "matrix": [2, 3], "x": 61, "y": 37},
+            {"flags": 1, "matrix": [3, 1], "x": 74, "y": 58},
+            {"flags": 1, "matrix": [3, 0], "x": 53, "y": 55},
+            {"flags": 4, "matrix": [2, 2], "x": 43, "y": 34},
+            {"flags": 4, "matrix": [1, 2], "x": 43, "y": 17},
+            {"flags": 4, "matrix": [0, 2], "x": 43, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 25, "y": 2},
+            {"flags": 4, "matrix": [1, 1], "x": 25, "y": 19},
+            {"flags": 4, "matrix": [2, 1], "x": 25, "y": 37},
+            {"flags": 4, "matrix": [2, 0], "x": 7, "y": 41},
+            {"flags": 4, "matrix": [1, 0], "x": 7, "y": 24},
+            {"flags": 4, "matrix": [0, 0], "x": 7, "y": 7},
+            {"flags": 2, "x": 153, "y": 4},
+            {"flags": 2, "x": 192, "y": 2},
+            {"flags": 2, "x": 224, "y": 24},
+            {"flags": 2, "x": 204, "y": 53},
+            {"flags": 2, "x": 161, "y": 57},
+            {"flags": 2, "x": 130, "y": 55},
+            {"flags": 1, "matrix": [7, 0], "x": 134, "y": 64},
+            {"flags": 4, "matrix": [6, 0], "x": 145, "y": 39},
+            {"flags": 4, "matrix": [5, 0], "x": 145, "y": 22},
+            {"flags": 4, "matrix": [4, 0], "x": 145, "y": 5},
+            {"flags": 4, "matrix": [4, 1], "x": 163, "y": 2},
+            {"flags": 4, "matrix": [5, 1], "x": 163, "y": 19},
+            {"flags": 4, "matrix": [6, 1], "x": 163, "y": 37},
+            {"flags": 1, "matrix": [7, 1], "x": 150, "y": 58},
+            {"flags": 1, "matrix": [7, 2], "x": 171, "y": 55},
+            {"flags": 4, "matrix": [6, 2], "x": 181, "y": 34},
+            {"flags": 4, "matrix": [5, 2], "x": 181, "y": 17},
+            {"flags": 4, "matrix": [4, 2], "x": 181, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 199, "y": 2},
+            {"flags": 4, "matrix": [5, 3], "x": 199, "y": 19},
+            {"flags": 4, "matrix": [6, 3], "x": 199, "y": 37},
+            {"flags": 4, "matrix": [6, 4], "x": 217, "y": 41},
+            {"flags": 4, "matrix": [5, 4], "x": 217, "y": 24},
+            {"flags": 4, "matrix": [4, 4], "x": 217, "y": 7}
           ]
     },
     "community_layouts": ["split_3x5_3"],
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0.25 },
-                { "matrix": [0, 1], "x": 1, "y": 0.125 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0.125 },
-                { "matrix": [0, 4], "x": 4, "y": 0.25 },
-                { "matrix": [4, 0], "x": 7, "y": 0.25 },
-                { "matrix": [4, 1], "x": 8, "y": 0.125 },
-                { "matrix": [4, 2], "x": 9, "y": 0 },
-                { "matrix": [4, 3], "x": 10, "y": 0.125 },
-                { "matrix": [4, 4], "x": 11, "y": 0.25 },
-                { "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1, "y": 1.125 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1.125 },
-                { "matrix": [1, 4], "x": 4, "y": 1.25 },
-                { "matrix": [5, 0], "x": 7, "y": 1.25 },
-                { "matrix": [5, 1], "x": 8, "y": 1.125 },
-                { "matrix": [5, 2], "x": 9, "y": 1 },
-                { "matrix": [5, 3], "x": 10, "y": 1.125 },
-                { "matrix": [5, 4], "x": 11, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1, "y": 2.125 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2.125 },
-                { "matrix": [2, 4], "x": 4, "y": 2.25 },
-                { "matrix": [6, 0], "x": 7, "y": 2.25 },
-                { "matrix": [6, 1], "x": 8, "y": 2.125 },
-                { "matrix": [6, 2], "x": 9, "y": 2 },
-                { "matrix": [6, 3], "x": 10, "y": 2.125 },
-                { "matrix": [6, 4], "x": 11, "y": 2.25 },
-                { "matrix": [3, 0], "x": 2.5, "y": 3.25 },
-                { "matrix": [3, 1], "x": 3.5, "y": 3.5 },
-                { "matrix": [3, 2], "x": 4.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 0], "x": 6.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 1], "x": 7.5, "y": 3.5 },
-                { "matrix": [7, 2], "x": 8.5, "y": 3.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.125},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.125},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [4, 0], "x": 7, "y": 0.25},
+                {"matrix": [4, 1], "x": 8, "y": 0.125},
+                {"matrix": [4, 2], "x": 9, "y": 0},
+                {"matrix": [4, 3], "x": 10, "y": 0.125},
+                {"matrix": [4, 4], "x": 11, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.125},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.125},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 0], "x": 7, "y": 1.25},
+                {"matrix": [5, 1], "x": 8, "y": 1.125},
+                {"matrix": [5, 2], "x": 9, "y": 1},
+                {"matrix": [5, 3], "x": 10, "y": 1.125},
+                {"matrix": [5, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.125},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.125},
+                {"matrix": [2, 4], "x": 4, "y": 2.25},
+                {"matrix": [6, 0], "x": 7, "y": 2.25},
+                {"matrix": [6, 1], "x": 8, "y": 2.125},
+                {"matrix": [6, 2], "x": 9, "y": 2},
+                {"matrix": [6, 3], "x": 10, "y": 2.125},
+                {"matrix": [6, 4], "x": 11, "y": 2.25},
+                {"matrix": [3, 0], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 0], "x": 6.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 1], "x": 7.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 8.5, "y": 3.25}
             ]
           }
     }
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index 0d85d35f29..4aa0b8eeaf 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -13,7 +13,7 @@
     "bootloader": "rp2040",
     "diode_direction": "COL2ROW",
     "build": {
-        "lto":true
+        "lto": true
     },
     "matrix_pins": {
         "direct": [
@@ -59,108 +59,108 @@
         "driver": "WS2812",
         "split_count": [27, 27],
         "layout": [
-            { "flags": 2, "x": 75, "y": 4 },
-            { "flags": 2, "x": 40, "y": 2 },
-            { "flags": 2, "x": 8, "y": 8 },
-            { "flags": 2, "x": 8, "y": 43 },
-            { "flags": 2, "x": 49, "y": 51 },
-            { "flags": 2, "x": 95, "y": 55 },
-            { "flags": 1, "matrix": [3, 2], "x": 92, "y": 64 },
-            { "flags": 4, "matrix": [2, 5], "x": 82, "y": 39 },
-            { "flags": 4, "matrix": [1, 5], "x": 82, "y": 22 },
-            { "flags": 4, "matrix": [0, 5], "x": 82, "y": 5 },
-            { "flags": 4, "matrix": [0, 4], "x": 65, "y": 2 },
-            { "flags": 4, "matrix": [1, 4], "x": 65, "y": 14 },
-            { "flags": 4, "matrix": [2, 4], "x": 65, "y": 37 },
-            { "flags": 1, "matrix": [3, 1], "x": 78, "y": 58 },
-            { "flags": 1, "matrix": [3, 0], "x": 58, "y": 55 },
-            { "flags": 4, "matrix": [2, 3], "x": 49, "y": 34 },
-            { "flags": 4, "matrix": [1, 3], "x": 49, "y": 17 },
-            { "flags": 4, "matrix": [0, 3], "x": 49, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 33, "y": 2 },
-            { "flags": 4, "matrix": [1, 2], "x": 33, "y": 19 },
-            { "flags": 4, "matrix": [2, 2], "x": 33, "y": 37 },
-            { "flags": 4, "matrix": [2, 1], "x": 16, "y": 41 },
-            { "flags": 4, "matrix": [1, 1], "x": 16, "y": 24 },
-            { "flags": 4, "matrix": [0, 1], "x": 16, "y": 7 },
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 7 },
-            { "flags": 1, "matrix": [1, 0], "x": 17, "y": 24 },
-            { "flags": 1, "matrix": [2, 0], "x": 34, "y": 41 },
-            { "flags": 2, "x": 149, "y": 4 },
-            { "flags": 2, "x": 184, "y": 2 },
-            { "flags": 2, "x": 216, "y": 8 },
-            { "flags": 2, "x": 216, "y": 43 },
-            { "flags": 2, "x": 175, "y": 51 },
-            { "flags": 2, "x": 129, "y": 55 },
-            { "flags": 1, "matrix": [7, 0], "x": 132, "y": 64 },
-            { "flags": 4, "matrix": [6, 0], "x": 142, "y": 39 },
-            { "flags": 4, "matrix": [5, 0], "x": 142, "y": 22 },
-            { "flags": 4, "matrix": [4, 0], "x": 142, "y": 5 },
-            { "flags": 4, "matrix": [4, 1], "x": 159, "y": 2 },
-            { "flags": 4, "matrix": [5, 1], "x": 159, "y": 19 },
-            { "flags": 4, "matrix": [6, 1], "x": 159, "y": 37 },
-            { "flags": 1, "matrix": [7, 1], "x": 146, "y": 58 },
-            { "flags": 1, "matrix": [7, 2], "x": 166, "y": 55 },
-            { "flags": 4, "matrix": [6, 2], "x": 175, "y": 34 },
-            { "flags": 4, "matrix": [5, 2], "x": 175, "y": 17 },
-            { "flags": 4, "matrix": [4, 2], "x": 175, "y": 0 },
-            { "flags": 4, "matrix": [4, 3], "x": 191, "y": 2 },
-            { "flags": 4, "matrix": [5, 3], "x": 191, "y": 19 },
-            { "flags": 4, "matrix": [6, 3], "x": 191, "y": 37 },
-            { "flags": 4, "matrix": [6, 4], "x": 208, "y": 41 },
-            { "flags": 4, "matrix": [5, 4], "x": 208, "y": 24 },
-            { "flags": 4, "matrix": [4, 4], "x": 208, "y": 7 },
-            { "flags": 1, "matrix": [4, 5], "x": 224, "y": 7 },
-            { "flags": 1, "matrix": [5, 5], "x": 224, "y": 24 },
-            { "flags": 1, "matrix": [6, 5], "x": 224, "y": 41 }
+            {"flags": 2, "x": 75, "y": 4},
+            {"flags": 2, "x": 40, "y": 2},
+            {"flags": 2, "x": 8, "y": 8},
+            {"flags": 2, "x": 8, "y": 43},
+            {"flags": 2, "x": 49, "y": 51},
+            {"flags": 2, "x": 95, "y": 55},
+            {"flags": 1, "matrix": [3, 2], "x": 92, "y": 64},
+            {"flags": 4, "matrix": [2, 5], "x": 82, "y": 39},
+            {"flags": 4, "matrix": [1, 5], "x": 82, "y": 22},
+            {"flags": 4, "matrix": [0, 5], "x": 82, "y": 5},
+            {"flags": 4, "matrix": [0, 4], "x": 65, "y": 2},
+            {"flags": 4, "matrix": [1, 4], "x": 65, "y": 14},
+            {"flags": 4, "matrix": [2, 4], "x": 65, "y": 37},
+            {"flags": 1, "matrix": [3, 1], "x": 78, "y": 58},
+            {"flags": 1, "matrix": [3, 0], "x": 58, "y": 55},
+            {"flags": 4, "matrix": [2, 3], "x": 49, "y": 34},
+            {"flags": 4, "matrix": [1, 3], "x": 49, "y": 17},
+            {"flags": 4, "matrix": [0, 3], "x": 49, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 33, "y": 2},
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 19},
+            {"flags": 4, "matrix": [2, 2], "x": 33, "y": 37},
+            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 41},
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 24},
+            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 7},
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 7},
+            {"flags": 1, "matrix": [1, 0], "x": 17, "y": 24},
+            {"flags": 1, "matrix": [2, 0], "x": 34, "y": 41},
+            {"flags": 2, "x": 149, "y": 4},
+            {"flags": 2, "x": 184, "y": 2},
+            {"flags": 2, "x": 216, "y": 8},
+            {"flags": 2, "x": 216, "y": 43},
+            {"flags": 2, "x": 175, "y": 51},
+            {"flags": 2, "x": 129, "y": 55},
+            {"flags": 1, "matrix": [7, 0], "x": 132, "y": 64},
+            {"flags": 4, "matrix": [6, 0], "x": 142, "y": 39},
+            {"flags": 4, "matrix": [5, 0], "x": 142, "y": 22},
+            {"flags": 4, "matrix": [4, 0], "x": 142, "y": 5},
+            {"flags": 4, "matrix": [4, 1], "x": 159, "y": 2},
+            {"flags": 4, "matrix": [5, 1], "x": 159, "y": 19},
+            {"flags": 4, "matrix": [6, 1], "x": 159, "y": 37},
+            {"flags": 1, "matrix": [7, 1], "x": 146, "y": 58},
+            {"flags": 1, "matrix": [7, 2], "x": 166, "y": 55},
+            {"flags": 4, "matrix": [6, 2], "x": 175, "y": 34},
+            {"flags": 4, "matrix": [5, 2], "x": 175, "y": 17},
+            {"flags": 4, "matrix": [4, 2], "x": 175, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 191, "y": 2},
+            {"flags": 4, "matrix": [5, 3], "x": 191, "y": 19},
+            {"flags": 4, "matrix": [6, 3], "x": 191, "y": 37},
+            {"flags": 4, "matrix": [6, 4], "x": 208, "y": 41},
+            {"flags": 4, "matrix": [5, 4], "x": 208, "y": 24},
+            {"flags": 4, "matrix": [4, 4], "x": 208, "y": 7},
+            {"flags": 1, "matrix": [4, 5], "x": 224, "y": 7},
+            {"flags": 1, "matrix": [5, 5], "x": 224, "y": 24},
+            {"flags": 1, "matrix": [6, 5], "x": 224, "y": 41}
           ]
     },
     "community_layouts": ["split_3x6_3"],
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0.25 },
-                { "matrix": [0, 1], "x": 1, "y": 0.25 },
-                { "matrix": [0, 2], "x": 2, "y": 0.125 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0.125 },
-                { "matrix": [0, 5], "x": 5, "y": 0.25 },
-                { "matrix": [4, 0], "x": 8, "y": 0.25 },
-                { "matrix": [4, 1], "x": 9, "y": 0.125 },
-                { "matrix": [4, 2], "x": 10, "y": 0 },
-                { "matrix": [4, 3], "x": 11, "y": 0.125 },
-                { "matrix": [4, 4], "x": 12, "y": 0.25 },
-                { "matrix": [4, 5], "x": 13, "y": 0.25 },
-                { "matrix": [1, 0], "x": 0, "y": 1.25 },
-                { "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "matrix": [1, 2], "x": 2, "y": 1.125 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1.125 },
-                { "matrix": [1, 5], "x": 5, "y": 1.25 },
-                { "matrix": [5, 0], "x": 8, "y": 1.25 },
-                { "matrix": [5, 1], "x": 9, "y": 1.125 },
-                { "matrix": [5, 2], "x": 10, "y": 1 },
-                { "matrix": [5, 3], "x": 11, "y": 1.125 },
-                { "matrix": [5, 4], "x": 12, "y": 1.25 },
-                { "matrix": [5, 5], "x": 13, "y": 1.25 },
-                { "matrix": [2, 0], "x": 0, "y": 2.25 },
-                { "matrix": [2, 1], "x": 1, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2, "y": 2.125 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2.125 },
-                { "matrix": [2, 5], "x": 5, "y": 2.25 },
-                { "matrix": [6, 0], "x": 8, "y": 2.25 },
-                { "matrix": [6, 1], "x": 9, "y": 2.125 },
-                { "matrix": [6, 2], "x": 10, "y": 2 },
-                { "matrix": [6, 3], "x": 11, "y": 2.125 },
-                { "matrix": [6, 4], "x": 12, "y": 2.25 },
-                { "matrix": [6, 5], "x": 13, "y": 2.25 },
-                { "matrix": [3, 0], "x": 3.5, "y": 3.25 },
-                { "matrix": [3, 1], "x": 4.5, "y": 3.5 },
-                { "matrix": [3, 2], "x": 5.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 0], "x": 7.5, "y": 3.75, "h":1.5 },
-                { "matrix": [7, 1], "x": 8.5, "y": 3.5 },
-                { "matrix": [7, 2], "x": 9.5, "y": 3.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 5.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75, "h": 1.5},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25}
             ]
           }
     }
diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json
index 59a80f4b3a..8dcd2e264e 100644
--- a/keyboards/crypt_macro/info.json
+++ b/keyboards/crypt_macro/info.json
@@ -23,10 +23,10 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0.5, "y":1, "w":2, "matrix": [1, 1]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0.5, "y": 1, "w": 2, "matrix": [1, 1]}
             ]
         }
     }
diff --git a/keyboards/dailycraft/owl8/info.json b/keyboards/dailycraft/owl8/info.json
index ee1d19e7d6..b1bcacb60b 100644
--- a/keyboards/dailycraft/owl8/info.json
+++ b/keyboards/dailycraft/owl8/info.json
@@ -24,25 +24,25 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 12]},
-                {"x":1, "y":0, "matrix": [0, 13]},
-                {"x":2, "y":0, "matrix": [0, 14]},
-                {"x":3, "y":0, "matrix": [0, 15]},
+                {"x": 0, "y": 0, "matrix": [0, 12]},
+                {"x": 1, "y": 0, "matrix": [0, 13]},
+                {"x": 2, "y": 0, "matrix": [0, 14]},
+                {"x": 3, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1.25, "matrix": [0, 8]},
-                {"x":1, "y":1.25, "matrix": [0, 9]},
-                {"x":2, "y":1.25, "matrix": [0, 10]},
-                {"x":3, "y":1.25, "matrix": [0, 11]},
+                {"x": 0, "y": 1.25, "matrix": [0, 8]},
+                {"x": 1, "y": 1.25, "matrix": [0, 9]},
+                {"x": 2, "y": 1.25, "matrix": [0, 10]},
+                {"x": 3, "y": 1.25, "matrix": [0, 11]},
 
-                {"x":0, "y":2.5, "matrix": [0, 0]},
-                {"x":1, "y":2.5, "matrix": [0, 1]},
-                {"x":2, "y":2.5, "matrix": [0, 2]},
-                {"x":3, "y":2.5, "matrix": [0, 3]},
+                {"x": 0, "y": 2.5, "matrix": [0, 0]},
+                {"x": 1, "y": 2.5, "matrix": [0, 1]},
+                {"x": 2, "y": 2.5, "matrix": [0, 2]},
+                {"x": 3, "y": 2.5, "matrix": [0, 3]},
 
-                {"x":0, "y":3.5, "matrix": [0, 4]},
-                {"x":1, "y":3.5, "matrix": [0, 5]},
-                {"x":2, "y":3.5, "matrix": [0, 6]},
-                {"x":3, "y":3.5, "matrix": [0, 7]}
+                {"x": 0, "y": 3.5, "matrix": [0, 4]},
+                {"x": 1, "y": 3.5, "matrix": [0, 5]},
+                {"x": 2, "y": 3.5, "matrix": [0, 6]},
+                {"x": 3, "y": 3.5, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json
index 9a468931b4..3f97ac6842 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/info.json
@@ -38,107 +38,107 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 4, "matrix": [0, 0], "x":0, "y":0},
-            {"flags": 4, "matrix": [0, 1], "x":62.2, "y":0},
-            {"flags": 4, "matrix": [0, 2], "x":99.6, "y":0},
-            {"flags": 4, "matrix": [0, 3], "x":124.4, "y":0},
-            {"flags": 4, "matrix": [0, 4], "x":149.3, "y":0},
-            {"flags": 4, "matrix": [0, 5], "x":174.2, "y":0},
-            {"flags": 4, "matrix": [0, 6], "x":199.1, "y":0},
-            {"flags": 4, "matrix": [0, 7], "x":224, "y":0},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 62.2, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 99.6, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 124.4, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 149.3, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 174.2, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 199.1, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 224, "y": 0},
 
-            {"flags": 4, "matrix": [1, 0], "x":0, "y":12.8},
-            {"flags": 4, "matrix": [1, 1], "x":24.9, "y":12.8},
-            {"flags": 4, "matrix": [1, 2], "x":49.8, "y":12.8},
-            {"flags": 4, "matrix": [1, 3], "x":74.6, "y":12.8},
-            {"flags": 4, "matrix": [1, 4], "x":99.6, "y":12.8},
-            {"flags": 4, "matrix": [1, 5], "x":124.4, "y":12.8},
-            {"flags": 4, "matrix": [1, 6], "x":149.3, "y":12.8},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 12.8},
+            {"flags": 4, "matrix": [1, 1], "x": 24.9, "y": 12.8},
+            {"flags": 4, "matrix": [1, 2], "x": 49.8, "y": 12.8},
+            {"flags": 4, "matrix": [1, 3], "x": 74.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 4], "x": 99.6, "y": 12.8},
+            {"flags": 4, "matrix": [1, 5], "x": 124.4, "y": 12.8},
+            {"flags": 4, "matrix": [1, 6], "x": 149.3, "y": 12.8},
 
-            {"flags": 4, "matrix": [2, 0], "x":0, "y":25.6},
-            {"flags": 4, "matrix": [2, 1], "x":24.9, "y":25.6},
-            {"flags": 4, "matrix": [2, 2], "x":49.8, "y":25.6},
-            {"flags": 4, "matrix": [2, 3], "x":74.6, "y":32},
-            {"flags": 4, "matrix": [2, 4], "x":90, "y":25.6},
-            {"flags": 4, "matrix": [2, 5], "x":124.4, "y":25.6},
-            {"flags": 4, "matrix": [2, 6], "x":149.3, "y":25.6},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 25.6},
+            {"flags": 4, "matrix": [2, 1], "x": 24.9, "y": 25.6},
+            {"flags": 4, "matrix": [2, 2], "x": 49.8, "y": 25.6},
+            {"flags": 4, "matrix": [2, 3], "x": 74.6, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 90, "y": 25.6},
+            {"flags": 4, "matrix": [2, 5], "x": 124.4, "y": 25.6},
+            {"flags": 4, "matrix": [2, 6], "x": 149.3, "y": 25.6},
 
-            {"flags": 4, "matrix": [3, 0], "x":0, "y":38.4},
-            {"flags": 4, "matrix": [3, 1], "x":24.9, "y":38.4},
-            {"flags": 4, "matrix": [3, 2], "x":49.8, "y":38.4},
-            {"flags": 4, "matrix": [3, 3], "x":99.6, "y":38.4},
-            {"flags": 4, "matrix": [3, 4], "x":124.4, "y":38.4},
-            {"flags": 4, "matrix": [3, 5], "x":149.3, "y":38.4},
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 38.4},
+            {"flags": 4, "matrix": [3, 1], "x": 24.9, "y": 38.4},
+            {"flags": 4, "matrix": [3, 2], "x": 49.8, "y": 38.4},
+            {"flags": 4, "matrix": [3, 3], "x": 99.6, "y": 38.4},
+            {"flags": 4, "matrix": [3, 4], "x": 124.4, "y": 38.4},
+            {"flags": 4, "matrix": [3, 5], "x": 149.3, "y": 38.4},
 
-            {"flags": 4, "matrix": [4, 0], "x":0, "y":51.2},
-            {"flags": 4, "matrix": [4, 1], "x":24.9, "y":51.2},
-            {"flags": 4, "matrix": [4, 2], "x":49.8, "y":51.2},
-            {"flags": 4, "matrix": [4, 3], "x":74.6, "y":57.6},
-            {"flags": 4, "matrix": [4, 5], "x":124.4, "y":51.2},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 51.2},
+            {"flags": 4, "matrix": [4, 1], "x": 24.9, "y": 51.2},
+            {"flags": 4, "matrix": [4, 2], "x": 49.8, "y": 51.2},
+            {"flags": 4, "matrix": [4, 3], "x": 74.6, "y": 57.6},
+            {"flags": 4, "matrix": [4, 5], "x": 124.4, "y": 51.2},
 
-            {"flags": 4, "matrix": [5, 0], "x":12.5, "y":64},
-            {"flags": 4, "matrix": [5, 1], "x":49.8, "y":64},
-            {"flags": 4, "matrix": [5, 2], "x":99.6, "y":64},
-            {"flags": 4, "matrix": [5, 3], "x":124.4, "y":64},
-            {"flags": 4, "matrix": [5, 4], "x":149.3, "y":64},
+            {"flags": 4, "matrix": [5, 0], "x": 12.5, "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 49.8, "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 99.6, "y": 64},
+            {"flags": 4, "matrix": [5, 3], "x": 124.4, "y": 64},
+            {"flags": 4, "matrix": [5, 4], "x": 149.3, "y": 64},
 
-            {"flags": 2, "x":224, "y":64},
-            {"flags": 2, "x":74.6, "y":64},
-            {"flags": 2, "x":0, "y":64},
-            {"flags": 2, "x":0, "y":0},
-            {"flags": 2, "x":74.6, "y":0},
-            {"flags": 2, "x":224, "y":0}
+            {"flags": 2, "x": 224, "y": 64},
+            {"flags": 2, "x": 74.6, "y": 64},
+            {"flags": 2, "x": 0, "y": 64},
+            {"flags": 2, "x": 0, "y": 0},
+            {"flags": 2, "x": 74.6, "y": 0},
+            {"flags": 2, "x": 224, "y": 0}
         ]
     },
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"BSPC", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"RGB BACK", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"RGB OFF", "x":3, "y":0},
-                {"matrix": [0, 4], "label":"RGB FORW", "x":4, "y":0},
-                {"matrix": [0, 5], "label":"MAKE", "x":5, "y":0},
-                {"matrix": [0, 6], "label":"REBOOT", "x":6, "y":0},
-                {"matrix": [0, 7], "label":"BOOTLOAD", "x":7, "y":0},
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "BSPC", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "RGB BACK", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "RGB OFF", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "RGB FORW", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "MAKE", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "REBOOT", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "BOOTLOAD", "x": 7, "y": 0},
 
-                {"matrix": [1, 0], "label":"NUMLOCK", "x":0, "y":1},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1},
-                {"matrix": [1, 4], "label":"PAUS", "x":3, "y":1},
-                {"matrix": [1, 5], "label":"SCRL", "x":3, "y":1},
-                {"matrix": [1, 6], "label":"PSCR", "x":3, "y":1},
+                {"matrix": [1, 0], "label": "NUMLOCK", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "PAUS", "x": 3, "y": 1},
+                {"matrix": [1, 5], "label": "SCRL", "x": 3, "y": 1},
+                {"matrix": [1, 6], "label": "PSCR", "x": 3, "y": 1},
 
-                {"matrix": [2, 0], "label":"7", "x":0, "y":2},
-                {"matrix": [2, 1], "label":"8", "x":1, "y":2},
-                {"matrix": [2, 2], "label":"9", "x":2, "y":2},
-                {"matrix": [2, 3], "label":"PPLS", "x":3, "y":2},
-                {"matrix": [2, 4], "label":"INS", "x":3, "y":2},
-                {"matrix": [2, 5], "label":"HOME", "x":3, "y":2},
-                {"matrix": [2, 6], "label":"PGUP", "x":3, "y":2},
+                {"matrix": [2, 0], "label": "7", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "8", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "9", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "INS", "x": 3, "y": 2},
+                {"matrix": [2, 5], "label": "HOME", "x": 3, "y": 2},
+                {"matrix": [2, 6], "label": "PGUP", "x": 3, "y": 2},
 
-                {"matrix": [3, 0], "label":"4", "x":0, "y":3},
-                {"matrix": [3, 1], "label":"5", "x":1, "y":3},
-                {"matrix": [3, 2], "label":"6", "x":2, "y":3},
-                {"matrix": [3, 3], "label":"END", "x":3, "y":3},
-                {"matrix": [3, 4], "label":"DEL", "x":3, "y":3},
-                {"matrix": [3, 5], "label":"PGDN", "x":3, "y":3},
+                {"matrix": [3, 0], "label": "4", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "5", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "6", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "END", "x": 3, "y": 3},
+                {"matrix": [3, 4], "label": "DEL", "x": 3, "y": 3},
+                {"matrix": [3, 5], "label": "PGDN", "x": 3, "y": 3},
 
-                {"matrix": [4, 0], "label":"1", "x":0, "y":4},
-                {"matrix": [4, 1], "label":"2", "x":1, "y":4},
-                {"matrix": [4, 2], "label":"3", "x":2, "y":4},
-                {"matrix": [4, 3], "label":"PENT", "x":3, "y":4},
-                {"matrix": [4, 5], "label":"UP", "x":3, "y":4},
+                {"matrix": [4, 0], "label": "1", "x": 0, "y": 4},
+                {"matrix": [4, 1], "label": "2", "x": 1, "y": 4},
+                {"matrix": [4, 2], "label": "3", "x": 2, "y": 4},
+                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4},
+                {"matrix": [4, 5], "label": "UP", "x": 3, "y": 4},
 
-                {"matrix": [5, 0], "label":"0", "x":0, "y":5},
-                {"matrix": [5, 1], "label":"PDOT", "x":1, "y":5},
-                {"matrix": [5, 2], "label":"LEFT", "x":2, "y":5},
-                {"matrix": [5, 3], "label":"DOWN", "x":3, "y":5},
-                {"matrix": [5, 4], "label":"RIGHT", "x":4, "y":5},
-                {"matrix": [5, 5], "label":"KNOB_L", "x":3, "y":5},
-                {"matrix": [5, 6], "label":"KNOB_R", "x":3, "y":5},
-                {"matrix": [5, 7], "label":"KNOB_D", "x":3, "y":5}
+                {"matrix": [5, 0], "label": "0", "x": 0, "y": 5},
+                {"matrix": [5, 1], "label": "PDOT", "x": 1, "y": 5},
+                {"matrix": [5, 2], "label": "LEFT", "x": 2, "y": 5},
+                {"matrix": [5, 3], "label": "DOWN", "x": 3, "y": 5},
+                {"matrix": [5, 4], "label": "RIGHT", "x": 4, "y": 5},
+                {"matrix": [5, 5], "label": "KNOB_L", "x": 3, "y": 5},
+                {"matrix": [5, 6], "label": "KNOB_R", "x": 3, "y": 5},
+                {"matrix": [5, 7], "label": "KNOB_D", "x": 3, "y": 5}
             ]
         }
     }
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/info.json
index 783a7da285..f5df3d6152 100644
--- a/keyboards/drop/sense75/info.json
+++ b/keyboards/drop/sense75/info.json
@@ -27,205 +27,205 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"Esc", "x":0, "y":0},
-                { "matrix": [0, 1], "label":"F1", "x":1.25, "y":0},
-                { "matrix": [0, 2], "label":"F2", "x":2.25, "y":0},
-                { "matrix": [0, 3], "label":"F3", "x":3.25, "y":0},
-                { "matrix": [0, 4], "label":"F4", "x":4.25, "y":0},
-                { "matrix": [0, 5], "label":"F5", "x":5.5, "y":0},
-                { "matrix": [0, 6], "label":"F6", "x":6.5, "y":0},
-                { "matrix": [0, 7], "label":"F7", "x":7.5, "y":0},
-                { "matrix": [0, 8], "label":"F8", "x":8.5, "y":0},
-                { "matrix": [0, 9], "label":"F9", "x":9.75, "y":0},
-                { "matrix": [0, 10], "label":"F10", "x":10.75, "y":0},
-                { "matrix": [0, 11], "label":"F11", "x":11.75, "y":0},
-                { "matrix": [0, 12], "label":"F12", "x":12.75, "y":0},
-                { "matrix": [0, 13], "label":"PrtSc", "x":14, "y":0},
-                { "matrix": [0, 14], "label":"Mute", "x":15.25, "y":0},
-                { "matrix": [1, 0], "label":"~", "x":0, "y":1.25},
-                { "matrix": [1, 1], "label":"!", "x":1, "y":1.25},
-                { "matrix": [1, 2], "label":"@", "x":2, "y":1.25},
-                { "matrix": [1, 3], "label":"#", "x":3, "y":1.25},
-                { "matrix": [1, 4], "label":"$", "x":4, "y":1.25},
-                { "matrix": [1, 5], "label":"%", "x":5, "y":1.25},
-                { "matrix": [1, 6], "label":"^", "x":6, "y":1.25},
-                { "matrix": [1, 7], "label":"&", "x":7, "y":1.25},
-                { "matrix": [1, 8], "label":"*", "x":8, "y":1.25},
-                { "matrix": [1, 9], "label":"(", "x":9, "y":1.25},
-                { "matrix": [1, 10], "label":")", "x":10, "y":1.25},
-                { "matrix": [1, 11], "label":"_", "x":11, "y":1.25},
-                { "matrix": [1, 12], "label":"+", "x":12, "y":1.25},
-                { "matrix": [1, 13], "label":"Backspace", "x":13, "y":1.25, "w":2},
-                { "matrix": [1, 14], "label":"Del", "x":15.25, "y":1.25},
-                { "matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
-                { "matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25},
-                { "matrix": [2, 2], "label":"W", "x":2.5, "y":2.25},
-                { "matrix": [2, 3], "label":"E", "x":3.5, "y":2.25},
-                { "matrix": [2, 4], "label":"R", "x":4.5, "y":2.25},
-                { "matrix": [2, 5], "label":"T", "x":5.5, "y":2.25},
-                { "matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25},
-                { "matrix": [2, 7], "label":"U", "x":7.5, "y":2.25},
-                { "matrix": [2, 8], "label":"I", "x":8.5, "y":2.25},
-                { "matrix": [2, 9], "label":"O", "x":9.5, "y":2.25},
-                { "matrix": [2, 10], "label":"P", "x":10.5, "y":2.25},
-                { "matrix": [2, 11], "label":"{", "x":11.5, "y":2.25},
-                { "matrix": [2, 12], "label":"}", "x":12.5, "y":2.25},
-                { "matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
-                { "matrix": [2, 14], "label":"Page Up", "x":15.25, "y":2.25},
-                { "matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                { "matrix": [3, 1], "label":"A", "x":1.75, "y":3.25},
-                { "matrix": [3, 2], "label":"S", "x":2.75, "y":3.25},
-                { "matrix": [3, 3], "label":"D", "x":3.75, "y":3.25},
-                { "matrix": [3, 4], "label":"F", "x":4.75, "y":3.25},
-                { "matrix": [3, 5], "label":"G", "x":5.75, "y":3.25},
-                { "matrix": [3, 6], "label":"H", "x":6.75, "y":3.25},
-                { "matrix": [3, 7], "label":"J", "x":7.75, "y":3.25},
-                { "matrix": [3, 8], "label":"K", "x":8.75, "y":3.25},
-                { "matrix": [3, 9], "label":"L", "x":9.75, "y":3.25},
-                { "matrix": [3, 10], "label":":", "x":10.75, "y":3.25},
-                { "matrix": [3, 11], "label":"\"", "x":11.75, "y":3.25},
-                { "matrix": [3, 12], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                { "matrix": [3, 14], "label":"Page Down", "x":15.25, "y":3.25},
-                { "matrix": [4, 0], "label":"Shift", "x":0, "y":4.25, "w":2.25},
-                { "matrix": [4, 1], "label":"Z", "x":2.25, "y":4.25},
-                { "matrix": [4, 2], "label":"X", "x":3.25, "y":4.25},
-                { "matrix": [4, 3], "label":"C", "x":4.25, "y":4.25},
-                { "matrix": [4, 4], "label":"V", "x":5.25, "y":4.25},
-                { "matrix": [4, 5], "label":"B", "x":6.25, "y":4.25},
-                { "matrix": [4, 6], "label":"N", "x":7.25, "y":4.25},
-                { "matrix": [4, 7], "label":"M", "x":8.25, "y":4.25},
-                { "matrix": [4, 8], "label":"<", "x":9.25, "y":4.25},
-                { "matrix": [4, 9], "label":">", "x":10.25, "y":4.25},
-                { "matrix": [4, 10], "label":"?", "x":11.25, "y":4.25},
-                { "matrix": [4, 11], "label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                { "matrix": [4, 13], "label":"\u2191", "x":14.25, "y":4.5},
-                { "matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                { "matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                { "matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                { "matrix": [5, 5], "label":" ", "x":3.75, "y":5.25, "w":6.25},
-                { "matrix": [5, 8], "label":"Alt", "x":10, "y":5.25},
-                { "matrix": [5, 9], "label":"Fn", "x":11, "y":5.25},
-                { "matrix": [5, 10], "label":"Ctrl", "x":12, "y":5.25},
-                { "matrix": [5, 12], "label":"\u2190", "x":13.25, "y":5.5},
-                { "matrix": [5, 13], "label":"\u2193", "x":14.25, "y":5.5},
-                { "matrix": [5, 14], "label":"\u2192", "x":15.25, "y":5.5}
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "PrtSc", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "Mute", "x": 15.25, "y": 0},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "label": "Del", "x": 15.25, "y": 1.25},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Page Up", "x": 15.25, "y": 2.25},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "\"", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "label": "Page Down", "x": 15.25, "y": 3.25},
+                {"matrix": [4, 0], "label": "Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "\u2191", "x": 14.25, "y": 4.5},
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "label": " ", "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "label": "Alt", "x": 10, "y": 5.25},
+                {"matrix": [5, 9], "label": "Fn", "x": 11, "y": 5.25},
+                {"matrix": [5, 10], "label": "Ctrl", "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "label": "\u2190", "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "label": "\u2193", "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "label": "\u2192", "x": 15.25, "y": 5.5}
             ]
         }
     },
     "rgb_matrix": {
         "driver": "IS31FL3733",
         "layout": [
-            { "flags": 2, "x": 2, "y": 0 },
-            { "flags": 2, "x": 22, "y": 0 },
-            { "flags": 2, "x": 42, "y": 0 },
-            { "flags": 2, "x": 62, "y": 0 },
-            { "flags": 2, "x": 82, "y": 0 },
-            { "flags": 2, "x": 102, "y": 0 },
-            { "flags": 2, "x": 122, "y": 0 },
-            { "flags": 2, "x": 142, "y": 0 },
-            { "flags": 2, "x": 162, "y": 0 },
-            { "flags": 2, "x": 182, "y": 0 },
-            { "flags": 2, "x": 202, "y": 0 },
-            { "flags": 2, "x": 222, "y": 0 },
-            { "flags": 2, "x": 0, "y": 7 },
-            { "flags": 4, "matrix": [0, 0], "x": 6, "y": 8 },
-            { "flags": 4, "matrix": [0, 1], "x": 24, "y": 8 },
-            { "flags": 4, "matrix": [0, 2], "x": 37, "y": 8 },
-            { "flags": 4, "matrix": [0, 3], "x": 51, "y": 8 },
-            { "flags": 4, "matrix": [0, 4], "x": 66, "y": 8 },
-            { "flags": 4, "matrix": [0, 5], "x": 82, "y": 8 },
-            { "flags": 4, "matrix": [0, 6], "x": 96, "y": 8 },
-            { "flags": 4, "matrix": [0, 7], "x": 110, "y": 8 },
-            { "flags": 4, "matrix": [0, 8], "x": 124, "y": 8 },
-            { "flags": 4, "matrix": [0, 9], "x": 141, "y": 8 },
-            { "flags": 4, "matrix": [0, 10], "x": 155, "y": 8 },
-            { "flags": 4, "matrix": [0, 11], "x": 169, "y": 8 },
-            { "flags": 4, "matrix": [0, 12], "x": 182, "y": 8 },
-            { "flags": 4, "matrix": [0, 13], "x": 199, "y": 8 },
-            { "flags": 2, "x": 224, "y": 4 },
-            { "flags": 2, "x": 0, "y": 12 },
-            { "flags": 4, "matrix": [1, 0], "x": 6, "y": 20 },
-            { "flags": 4, "matrix": [1, 1], "x": 20, "y": 20 },
-            { "flags": 4, "matrix": [1, 2], "x": 34, "y": 20 },
-            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 20 },
-            { "flags": 4, "matrix": [1, 4], "x": 62, "y": 20 },
-            { "flags": 4, "matrix": [1, 5], "x": 75, "y": 20 },
-            { "flags": 4, "matrix": [1, 6], "x": 90, "y": 20 },
-            { "flags": 4, "matrix": [1, 7], "x": 103, "y": 20 },
-            { "flags": 4, "matrix": [1, 8], "x": 117, "y": 20 },
-            { "flags": 4, "matrix": [1, 9], "x": 130, "y": 20 },
-            { "flags": 4, "matrix": [1, 10], "x": 144, "y": 20 },
-            { "flags": 4, "matrix": [1, 11], "x": 158, "y": 20 },
-            { "flags": 4, "matrix": [1, 12], "x": 170, "y": 20 },
-            { "flags": 4, "matrix": [1, 13], "x": 192, "y": 20 },
-            { "flags": 4, "matrix": [1, 14], "x": 217, "y": 20 },
-            { "flags": 2, "x": 224, "y": 12 },
-            { "flags": 2, "x": 0, "y": 22 },
-            { "flags": 4, "matrix": [2, 0], "x": 10, "y": 30 },
-            { "flags": 4, "matrix": [2, 1], "x": 27, "y": 30 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 30 },
-            { "flags": 4, "matrix": [2, 3], "x": 54, "y": 30 },
-            { "flags": 4, "matrix": [2, 4], "x": 69, "y": 30 },
-            { "flags": 4, "matrix": [2, 5], "x": 82, "y": 30 },
-            { "flags": 4, "matrix": [2, 6], "x": 96, "y": 30 },
-            { "flags": 4, "matrix": [2, 7], "x": 110, "y": 30 },
-            { "flags": 4, "matrix": [2, 8], "x": 123, "y": 30 },
-            { "flags": 4, "matrix": [2, 9], "x": 138, "y": 30 },
-            { "flags": 4, "matrix": [2, 10], "x": 151, "y": 30 },
-            { "flags": 4, "matrix": [2, 11], "x": 165, "y": 30 },
-            { "flags": 4, "matrix": [2, 12], "x": 179, "y": 30 },
-            { "flags": 4, "matrix": [2, 13], "x": 196, "y": 30 },
-            { "flags": 4, "matrix": [2, 14], "x": 217, "y": 30 },
-            { "flags": 2, "x": 224, "y": 22 },
-            { "flags": 4, "matrix": [3, 0], "x": 11, "y": 40 },
-            { "flags": 4, "matrix": [3, 1], "x": 30, "y": 40 },
-            { "flags": 4, "matrix": [3, 2], "x": 44, "y": 40 },
-            { "flags": 4, "matrix": [3, 3], "x": 57, "y": 40 },
-            { "flags": 4, "matrix": [3, 4], "x": 72, "y": 40 },
-            { "flags": 4, "matrix": [3, 5], "x": 85, "y": 40 },
-            { "flags": 4, "matrix": [3, 6], "x": 99, "y": 40 },
-            { "flags": 4, "matrix": [3, 7], "x": 113, "y": 40 },
-            { "flags": 4, "matrix": [3, 8], "x": 126, "y": 40 },
-            { "flags": 4, "matrix": [3, 9], "x": 140, "y": 40 },
-            { "flags": 4, "matrix": [3, 10], "x": 154, "y": 40 },
-            { "flags": 4, "matrix": [3, 11], "x": 169, "y": 40 },
-            { "flags": 4, "matrix": [3, 12], "x": 190, "y": 40 },
-            { "flags": 4, "matrix": [3, 14], "x": 217, "y": 40 },
-            { "flags": 2, "x": 0, "y": 42 },
-            { "flags": 4, "matrix": [4, 0], "x": 15, "y": 50 },
-            { "flags": 4, "matrix": [4, 1], "x": 37, "y": 50 },
-            { "flags": 4, "matrix": [4, 2], "x": 51, "y": 50 },
-            { "flags": 4, "matrix": [4, 3], "x": 66, "y": 50 },
-            { "flags": 4, "matrix": [4, 4], "x": 79, "y": 50 },
-            { "flags": 4, "matrix": [4, 5], "x": 93, "y": 50 },
-            { "flags": 4, "matrix": [4, 6], "x": 107, "y": 50 },
-            { "flags": 4, "matrix": [4, 7], "x": 120, "y": 50 },
-            { "flags": 4, "matrix": [4, 8], "x": 134, "y": 50 },
-            { "flags": 4, "matrix": [4, 9], "x": 148, "y": 50 },
-            { "flags": 4, "matrix": [4, 10], "x": 161, "y": 50 },
-            { "flags": 4, "matrix": [4, 11], "x": 180, "y": 50 },
-            { "flags": 4, "matrix": [4, 13], "x": 202, "y": 53 },
-            { "flags": 2, "x": 224, "y": 42 },
-            { "flags": 2, "x": 0, "y": 51 },
-            { "flags": 4, "matrix": [5, 0], "x": 8, "y": 60 },
-            { "flags": 4, "matrix": [5, 1], "x": 26, "y": 60 },
-            { "flags": 4, "matrix": [5, 2], "x": 42, "y": 60 },
-            { "flags": 4, "matrix": [5, 5], "x": 94, "y": 60 },
-            { "flags": 4, "matrix": [5, 8], "x": 144, "y": 60 },
-            { "flags": 4, "matrix": [5, 9], "x": 158, "y": 60 },
-            { "flags": 4, "matrix": [5, 10], "x": 172, "y": 60 },
-            { "flags": 4, "matrix": [5, 12], "x": 189, "y": 63 },
-            { "flags": 4, "matrix": [5, 13], "x": 202, "y": 63 },
-            { "flags": 4, "matrix": [5, 14], "x": 217, "y": 63 },
-            { "flags": 2, "x": 224, "y": 51 },
-            { "flags": 2, "x": 9, "y": 64 },
-            { "flags": 2, "x": 38, "y": 64 },
-            { "flags": 2, "x": 69, "y": 64 },
-            { "flags": 2, "x": 96, "y": 64 },
-            { "flags": 2, "x": 125, "y": 64 },
-            { "flags": 2, "x": 154, "y": 64 },
-            { "flags": 2, "x": 182, "y": 64 },
-            { "flags": 2, "x": 211, "y": 64 }
+            {"flags": 2, "x": 2, "y": 0},
+            {"flags": 2, "x": 22, "y": 0},
+            {"flags": 2, "x": 42, "y": 0},
+            {"flags": 2, "x": 62, "y": 0},
+            {"flags": 2, "x": 82, "y": 0},
+            {"flags": 2, "x": 102, "y": 0},
+            {"flags": 2, "x": 122, "y": 0},
+            {"flags": 2, "x": 142, "y": 0},
+            {"flags": 2, "x": 162, "y": 0},
+            {"flags": 2, "x": 182, "y": 0},
+            {"flags": 2, "x": 202, "y": 0},
+            {"flags": 2, "x": 222, "y": 0},
+            {"flags": 2, "x": 0, "y": 7},
+            {"flags": 4, "matrix": [0, 0], "x": 6, "y": 8},
+            {"flags": 4, "matrix": [0, 1], "x": 24, "y": 8},
+            {"flags": 4, "matrix": [0, 2], "x": 37, "y": 8},
+            {"flags": 4, "matrix": [0, 3], "x": 51, "y": 8},
+            {"flags": 4, "matrix": [0, 4], "x": 66, "y": 8},
+            {"flags": 4, "matrix": [0, 5], "x": 82, "y": 8},
+            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 8},
+            {"flags": 4, "matrix": [0, 7], "x": 110, "y": 8},
+            {"flags": 4, "matrix": [0, 8], "x": 124, "y": 8},
+            {"flags": 4, "matrix": [0, 9], "x": 141, "y": 8},
+            {"flags": 4, "matrix": [0, 10], "x": 155, "y": 8},
+            {"flags": 4, "matrix": [0, 11], "x": 169, "y": 8},
+            {"flags": 4, "matrix": [0, 12], "x": 182, "y": 8},
+            {"flags": 4, "matrix": [0, 13], "x": 199, "y": 8},
+            {"flags": 2, "x": 224, "y": 4},
+            {"flags": 2, "x": 0, "y": 12},
+            {"flags": 4, "matrix": [1, 0], "x": 6, "y": 20},
+            {"flags": 4, "matrix": [1, 1], "x": 20, "y": 20},
+            {"flags": 4, "matrix": [1, 2], "x": 34, "y": 20},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 20},
+            {"flags": 4, "matrix": [1, 4], "x": 62, "y": 20},
+            {"flags": 4, "matrix": [1, 5], "x": 75, "y": 20},
+            {"flags": 4, "matrix": [1, 6], "x": 90, "y": 20},
+            {"flags": 4, "matrix": [1, 7], "x": 103, "y": 20},
+            {"flags": 4, "matrix": [1, 8], "x": 117, "y": 20},
+            {"flags": 4, "matrix": [1, 9], "x": 130, "y": 20},
+            {"flags": 4, "matrix": [1, 10], "x": 144, "y": 20},
+            {"flags": 4, "matrix": [1, 11], "x": 158, "y": 20},
+            {"flags": 4, "matrix": [1, 12], "x": 170, "y": 20},
+            {"flags": 4, "matrix": [1, 13], "x": 192, "y": 20},
+            {"flags": 4, "matrix": [1, 14], "x": 217, "y": 20},
+            {"flags": 2, "x": 224, "y": 12},
+            {"flags": 2, "x": 0, "y": 22},
+            {"flags": 4, "matrix": [2, 0], "x": 10, "y": 30},
+            {"flags": 4, "matrix": [2, 1], "x": 27, "y": 30},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 30},
+            {"flags": 4, "matrix": [2, 3], "x": 54, "y": 30},
+            {"flags": 4, "matrix": [2, 4], "x": 69, "y": 30},
+            {"flags": 4, "matrix": [2, 5], "x": 82, "y": 30},
+            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 30},
+            {"flags": 4, "matrix": [2, 7], "x": 110, "y": 30},
+            {"flags": 4, "matrix": [2, 8], "x": 123, "y": 30},
+            {"flags": 4, "matrix": [2, 9], "x": 138, "y": 30},
+            {"flags": 4, "matrix": [2, 10], "x": 151, "y": 30},
+            {"flags": 4, "matrix": [2, 11], "x": 165, "y": 30},
+            {"flags": 4, "matrix": [2, 12], "x": 179, "y": 30},
+            {"flags": 4, "matrix": [2, 13], "x": 196, "y": 30},
+            {"flags": 4, "matrix": [2, 14], "x": 217, "y": 30},
+            {"flags": 2, "x": 224, "y": 22},
+            {"flags": 4, "matrix": [3, 0], "x": 11, "y": 40},
+            {"flags": 4, "matrix": [3, 1], "x": 30, "y": 40},
+            {"flags": 4, "matrix": [3, 2], "x": 44, "y": 40},
+            {"flags": 4, "matrix": [3, 3], "x": 57, "y": 40},
+            {"flags": 4, "matrix": [3, 4], "x": 72, "y": 40},
+            {"flags": 4, "matrix": [3, 5], "x": 85, "y": 40},
+            {"flags": 4, "matrix": [3, 6], "x": 99, "y": 40},
+            {"flags": 4, "matrix": [3, 7], "x": 113, "y": 40},
+            {"flags": 4, "matrix": [3, 8], "x": 126, "y": 40},
+            {"flags": 4, "matrix": [3, 9], "x": 140, "y": 40},
+            {"flags": 4, "matrix": [3, 10], "x": 154, "y": 40},
+            {"flags": 4, "matrix": [3, 11], "x": 169, "y": 40},
+            {"flags": 4, "matrix": [3, 12], "x": 190, "y": 40},
+            {"flags": 4, "matrix": [3, 14], "x": 217, "y": 40},
+            {"flags": 2, "x": 0, "y": 42},
+            {"flags": 4, "matrix": [4, 0], "x": 15, "y": 50},
+            {"flags": 4, "matrix": [4, 1], "x": 37, "y": 50},
+            {"flags": 4, "matrix": [4, 2], "x": 51, "y": 50},
+            {"flags": 4, "matrix": [4, 3], "x": 66, "y": 50},
+            {"flags": 4, "matrix": [4, 4], "x": 79, "y": 50},
+            {"flags": 4, "matrix": [4, 5], "x": 93, "y": 50},
+            {"flags": 4, "matrix": [4, 6], "x": 107, "y": 50},
+            {"flags": 4, "matrix": [4, 7], "x": 120, "y": 50},
+            {"flags": 4, "matrix": [4, 8], "x": 134, "y": 50},
+            {"flags": 4, "matrix": [4, 9], "x": 148, "y": 50},
+            {"flags": 4, "matrix": [4, 10], "x": 161, "y": 50},
+            {"flags": 4, "matrix": [4, 11], "x": 180, "y": 50},
+            {"flags": 4, "matrix": [4, 13], "x": 202, "y": 53},
+            {"flags": 2, "x": 224, "y": 42},
+            {"flags": 2, "x": 0, "y": 51},
+            {"flags": 4, "matrix": [5, 0], "x": 8, "y": 60},
+            {"flags": 4, "matrix": [5, 1], "x": 26, "y": 60},
+            {"flags": 4, "matrix": [5, 2], "x": 42, "y": 60},
+            {"flags": 4, "matrix": [5, 5], "x": 94, "y": 60},
+            {"flags": 4, "matrix": [5, 8], "x": 144, "y": 60},
+            {"flags": 4, "matrix": [5, 9], "x": 158, "y": 60},
+            {"flags": 4, "matrix": [5, 10], "x": 172, "y": 60},
+            {"flags": 4, "matrix": [5, 12], "x": 189, "y": 63},
+            {"flags": 4, "matrix": [5, 13], "x": 202, "y": 63},
+            {"flags": 4, "matrix": [5, 14], "x": 217, "y": 63},
+            {"flags": 2, "x": 224, "y": 51},
+            {"flags": 2, "x": 9, "y": 64},
+            {"flags": 2, "x": 38, "y": 64},
+            {"flags": 2, "x": 69, "y": 64},
+            {"flags": 2, "x": 96, "y": 64},
+            {"flags": 2, "x": 125, "y": 64},
+            {"flags": 2, "x": 154, "y": 64},
+            {"flags": 2, "x": 182, "y": 64},
+            {"flags": 2, "x": 211, "y": 64}
         ]
     },
     "encoder": {
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index 8a09eeea34..09120c47af 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -5,22 +5,7 @@
     "maintainer": "dayatz",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
-        "cols": [
-            "F7",
-            "F6",
-            "F5",
-            "F4",
-            "F1",
-            "F0",
-            "D7",
-            "D3",
-            "D2",
-            "E6",
-            "B3",
-            "B2",
-            "B1",
-            "B0"
-        ],
+        "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D7", "D3", "D2", "E6", "B3", "B2", "B1", "B0"],
         "rows": ["B4", "B5", "B6", "D6", "D4"]
     },
     "rgblight": {
diff --git a/keyboards/dztech/tofu/ii/v1/info.json b/keyboards/dztech/tofu/ii/v1/info.json
index bce81094c2..d8216891cd 100644
--- a/keyboards/dztech/tofu/ii/v1/info.json
+++ b/keyboards/dztech/tofu/ii/v1/info.json
@@ -18,72 +18,72 @@
     "rgb_matrix": {
         "driver": "IS31FL3737",
         "layout": [
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-            { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0 },
-            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0 },
-            { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0 },
-            { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0 },
-            { "flags": 4, "matrix": [0, 7], "x": 105, "y": 0 },
-            { "flags": 4, "matrix": [0, 8], "x": 120, "y": 0 },
-            { "flags": 4, "matrix": [0, 9], "x": 135, "y": 0 },
-            { "flags": 4, "matrix": [0, 10], "x": 150, "y": 0 },
-            { "flags": 4, "matrix": [0, 11], "x": 165, "y": 0 },
-            { "flags": 4, "matrix": [0, 12], "x": 180, "y": 0 },
-            { "flags": 4, "matrix": [0, 13], "x": 203, "y": 0 },
-            { "flags": 1, "matrix": [0, 14], "x": 224, "y": 0 },
-            { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16 },
-            { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16 },
-            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16 },
-            { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16 },
-            { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16 },
-            { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16 },
-            { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16 },
-            { "flags": 4, "matrix": [1, 7], "x": 113, "y": 16 },
-            { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 },
-            { "flags": 4, "matrix": [1, 9], "x": 143, "y": 16 },
-            { "flags": 4, "matrix": [1, 10], "x": 158, "y": 16 },
-            { "flags": 4, "matrix": [1, 11], "x": 173, "y": 16 },
-            { "flags": 4, "matrix": [1, 12], "x": 188, "y": 16 },
-            { "flags": 4, "matrix": [1, 13], "x": 206, "y": 16 },
-            { "flags": 1, "matrix": [1, 14], "x": 224, "y": 16 },
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32 },
-            { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32 },
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32 },
-            { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32 },
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32 },
-            { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32 },
-            { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
-            { "flags": 4, "matrix": [2, 7], "x": 116, "y": 32 },
-            { "flags": 4, "matrix": [2, 8], "x": 131, "y": 32 },
-            { "flags": 4, "matrix": [2, 9], "x": 146, "y": 32 },
-            { "flags": 4, "matrix": [2, 10], "x": 161, "y": 32 },
-            { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 },
-            { "flags": 4, "matrix": [2, 12], "x": 201, "y": 32 },
-            { "flags": 1, "matrix": [2, 14], "x": 224, "y": 32 },
-            { "flags": 1, "matrix": [3, 0], "x": 9, "y": 48 },
-            { "flags": 4, "matrix": [3, 1], "x": 34, "y": 48 },
-            { "flags": 4, "matrix": [3, 2], "x": 49, "y": 48 },
-            { "flags": 4, "matrix": [3, 3], "x": 64, "y": 48 },
-            { "flags": 4, "matrix": [3, 4], "x": 79, "y": 48 },
-            { "flags": 4, "matrix": [3, 5], "x": 94, "y": 48 },
-            { "flags": 4, "matrix": [3, 6], "x": 109, "y": 48 },
-            { "flags": 4, "matrix": [3, 7], "x": 124, "y": 48 },
-            { "flags": 4, "matrix": [3, 8], "x": 139, "y": 48 },
-            { "flags": 4, "matrix": [3, 9], "x": 154, "y": 48 },
-            { "flags": 4, "matrix": [3, 10], "x": 169, "y": 48 },
-            { "flags": 4, "matrix": [3, 11], "x": 189, "y": 48 },
-            { "flags": 4, "matrix": [3, 13], "x": 210, "y": 48 },
-            { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64 },
-            { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64 },
-            { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 },
-            { "flags": 1, "matrix": [4, 8], "x": 151, "y": 64 },
-            { "flags": 1, "matrix": [4, 10], "x": 170, "y": 64 },
-            { "flags": 1, "matrix": [4, 12], "x": 195, "y": 64 },
-            { "flags": 1, "matrix": [4, 13], "x": 210, "y": 64 },
-            { "flags": 1, "matrix": [4, 14], "x": 224, "y": 64 }
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 203, "y": 0},
+            {"flags": 1, "matrix": [0, 14], "x": 224, "y": 0},
+            {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
+            {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
+            {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
+            {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
+            {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
+            {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
+            {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16},
+            {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16},
+            {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16},
+            {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16},
+            {"flags": 4, "matrix": [1, 13], "x": 206, "y": 16},
+            {"flags": 1, "matrix": [1, 14], "x": 224, "y": 16},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
+            {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
+            {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32},
+            {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32},
+            {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32},
+            {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32},
+            {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            {"flags": 4, "matrix": [2, 12], "x": 201, "y": 32},
+            {"flags": 1, "matrix": [2, 14], "x": 224, "y": 32},
+            {"flags": 1, "matrix": [3, 0], "x": 9, "y": 48},
+            {"flags": 4, "matrix": [3, 1], "x": 34, "y": 48},
+            {"flags": 4, "matrix": [3, 2], "x": 49, "y": 48},
+            {"flags": 4, "matrix": [3, 3], "x": 64, "y": 48},
+            {"flags": 4, "matrix": [3, 4], "x": 79, "y": 48},
+            {"flags": 4, "matrix": [3, 5], "x": 94, "y": 48},
+            {"flags": 4, "matrix": [3, 6], "x": 109, "y": 48},
+            {"flags": 4, "matrix": [3, 7], "x": 124, "y": 48},
+            {"flags": 4, "matrix": [3, 8], "x": 139, "y": 48},
+            {"flags": 4, "matrix": [3, 9], "x": 154, "y": 48},
+            {"flags": 4, "matrix": [3, 10], "x": 169, "y": 48},
+            {"flags": 4, "matrix": [3, 11], "x": 189, "y": 48},
+            {"flags": 4, "matrix": [3, 13], "x": 210, "y": 48},
+            {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
+            {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
+            {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
+            {"flags": 1, "matrix": [4, 8], "x": 151, "y": 64},
+            {"flags": 1, "matrix": [4, 10], "x": 170, "y": 64},
+            {"flags": 1, "matrix": [4, 12], "x": 195, "y": 64},
+            {"flags": 1, "matrix": [4, 13], "x": 210, "y": 64},
+            {"flags": 1, "matrix": [4, 14], "x": 224, "y": 64}
         ]
     },
     "usb": {
@@ -94,72 +94,72 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
-                { "matrix": [0, 11], "x": 11, "y": 0 },
-                { "matrix": [0, 12], "x": 12, "y": 0 },
-                { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
-                { "matrix": [0, 14], "x": 15, "y": 0 },
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
-                { "matrix": [1, 14], "x": 15, "y": 1 },
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 },
-                { "matrix": [2, 14], "x": 15, "y": 2 },
-                { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 2.25, "y": 3 },
-                { "matrix": [3, 2], "x": 3.25, "y": 3 },
-                { "matrix": [3, 3], "x": 4.25, "y": 3 },
-                { "matrix": [3, 4], "x": 5.25, "y": 3 },
-                { "matrix": [3, 5], "x": 6.25, "y": 3 },
-                { "matrix": [3, 6], "x": 7.25, "y": 3 },
-                { "matrix": [3, 7], "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "x": 9.25, "y": 3 },
-                { "matrix": [3, 9], "x": 10.25, "y": 3 },
-                { "matrix": [3, 10], "x": 11.25, "y": 3 },
-                { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 8], "w": 1.25, "x":10, "y":4 },
-                { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 },
-                { "matrix": [4, 12], "x": 13, "y": 4 },
-                { "matrix": [4, 13], "x": 14, "y": 4 },
-                { "matrix": [4, 14], "x": 15, "y": 4 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 8], "w": 1.25, "x": 10, "y": 4},
+                {"matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/ebastler/e80_1800/info.json b/keyboards/ebastler/e80_1800/info.json
index 8f4ef69f2d..b595c85118 100644
--- a/keyboards/ebastler/e80_1800/info.json
+++ b/keyboards/ebastler/e80_1800/info.json
@@ -40,566 +40,566 @@
     "layouts": {
         "LAYOUT_1800_all": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_iso_6u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_iso_7u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 13], "label":"#", "x":12.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":13.75, "y":3, "w":1.25, "h":2},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 13], "label": "#", "x": 12.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "label":"|", "x":1.25, "y":5},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "label": "|", "x": 1.25, "y": 5},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5},
-                {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7},
-                {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5},
-                {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [6, 2], "label": "Alt", "x": 1.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 7},
+                {"matrix": [6, 9], "label": "AltGr", "x": 10, "y": 6, "w": 1.5},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 11.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_ansi_6u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6},
-                {"matrix":[6, 1], "label":"Win", "x":1, "y":6},
-                {"matrix":[6, 2], "label":"Alt", "x":2, "y":6},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":6},
-                {"matrix":[6, 9], "label":"AltGr", "x":9, "y":6},
-                {"matrix":[6, 10], "label":"Win", "x":10, "y":6},
-                {"matrix":[6, 11], "label":"Menu", "x":11, "y":6},
-                {"matrix":[6, 12], "label":"Ctrl", "x":12, "y":6},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6},
+                {"matrix": [6, 1], "label": "Win", "x": 1, "y": 6},
+                {"matrix": [6, 2], "label": "Alt", "x": 2, "y": 6},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 6},
+                {"matrix": [6, 9], "label": "AltGr", "x": 9, "y": 6},
+                {"matrix": [6, 10], "label": "Win", "x": 10, "y": 6},
+                {"matrix": [6, 11], "label": "Menu", "x": 11, "y": 6},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 12, "y": 6},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         },
         "LAYOUT_1800_ansi_7u": {
             "layout": [
-                {"matrix":[0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix":[0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix":[0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix":[0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix":[0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix":[0, 6], "label":"F5", "x":5.5, "y":0},
-                {"matrix":[0, 7], "label":"F6", "x":6.5, "y":0},
-                {"matrix":[0, 8], "label":"F7", "x":7.5, "y":0},
-                {"matrix":[0, 9], "label":"F8", "x":8.5, "y":0},
-                {"matrix":[0, 10], "label":"F9", "x":9.75, "y":0},
-                {"matrix":[0, 11], "label":"F10", "x":10.75, "y":0},
-                {"matrix":[0, 12], "label":"F11", "x":11.75, "y":0},
-                {"matrix":[0, 13], "label":"F12", "x":12.75, "y":0},
-                {"matrix":[0, 15], "label":"Insert", "x":15.5, "y":0},
-                {"matrix":[0, 16], "label":"Home", "x":16.5, "y":0},
-                {"matrix":[0, 17], "label":"PgUp", "x":17.5, "y":0},
-                {"matrix":[0, 18], "label":"PrtSc", "x":18.5, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 15], "label": "Insert", "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "label": "Home", "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "label": "PgUp", "x": 17.5, "y": 0},
+                {"matrix": [0, 18], "label": "PrtSc", "x": 18.5, "y": 0},
 
-                {"matrix":[1, 15], "label":"Delete", "x":15.5, "y":1},
-                {"matrix":[1, 16], "label":"End", "x":16.5, "y":1},
-                {"matrix":[1, 17], "label":"PgDn", "x":17.5, "y":1},
-                {"matrix":[1, 18], "label":"Scroll Lock", "x":18.5, "y":1},
+                {"matrix": [1, 15], "label": "Delete", "x": 15.5, "y": 1},
+                {"matrix": [1, 16], "label": "End", "x": 16.5, "y": 1},
+                {"matrix": [1, 17], "label": "PgDn", "x": 17.5, "y": 1},
+                {"matrix": [1, 18], "label": "Scroll Lock", "x": 18.5, "y": 1},
 
-                {"matrix":[2, 0], "label":"tild", "x":0, "y":2},
-                {"matrix":[2, 1], "label":"1", "x":1, "y":2},
-                {"matrix":[2, 2], "label":"2", "x":2, "y":2},
-                {"matrix":[2, 3], "label":"3", "x":3, "y":2},
-                {"matrix":[2, 4], "label":"4", "x":4, "y":2},
-                {"matrix":[2, 5], "label":"5", "x":5, "y":2},
-                {"matrix":[2, 6], "label":"6", "x":6, "y":2},
-                {"matrix":[2, 7], "label":"7", "x":7, "y":2},
-                {"matrix":[2, 8], "label":"8", "x":8, "y":2},
-                {"matrix":[2, 9], "label":"9", "x":9, "y":2},
-                {"matrix":[2, 10], "label":"0", "x":10, "y":2},
-                {"matrix":[2, 11], "label":"-", "x":11, "y":2},
-                {"matrix":[2, 12], "label":"=", "x":12, "y":2},
-                {"matrix":[2, 14], "label":"Backspace", "x":13, "y":2, "w":2},
-                {"matrix":[2, 15], "label":"Num Lock", "x":15.5, "y":2},
-                {"matrix":[2, 16], "label":"/", "x":16.5, "y":2},
-                {"matrix":[2, 17], "label":"*", "x":17.5, "y":2},
-                {"matrix":[2, 18], "label":"Pause", "x":18.5, "y":2},
+                {"matrix": [2, 0], "label": "tild", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "1", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "2", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "3", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "4", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "5", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "6", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "7", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "8", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "9", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "0", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "-", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "=", "x": 12, "y": 2},
+                {"matrix": [2, 14], "label": "Backspace", "x": 13, "y": 2, "w": 2},
+                {"matrix": [2, 15], "label": "Num Lock", "x": 15.5, "y": 2},
+                {"matrix": [2, 16], "label": "/", "x": 16.5, "y": 2},
+                {"matrix": [2, 17], "label": "*", "x": 17.5, "y": 2},
+                {"matrix": [2, 18], "label": "Pause", "x": 18.5, "y": 2},
 
-                {"matrix":[3, 0], "label":"Tab", "x":0, "y":3, "w":1.5},
-                {"matrix":[3, 2], "label":"Q", "x":1.5, "y":3},
-                {"matrix":[3, 3], "label":"W", "x":2.5, "y":3},
-                {"matrix":[3, 4], "label":"E", "x":3.5, "y":3},
-                {"matrix":[3, 5], "label":"R", "x":4.5, "y":3},
-                {"matrix":[3, 6], "label":"T", "x":5.5, "y":3},
-                {"matrix":[3, 7], "label":"Y", "x":6.5, "y":3},
-                {"matrix":[3, 8], "label":"U", "x":7.5, "y":3},
-                {"matrix":[3, 9], "label":"I", "x":8.5, "y":3},
-                {"matrix":[3, 10], "label":"O", "x":9.5, "y":3},
-                {"matrix":[3, 11], "label":"P", "x":10.5, "y":3},
-                {"matrix":[3, 12], "label":"[", "x":11.5, "y":3},
-                {"matrix":[3, 13], "label":"]", "x":12.5, "y":3},
-                {"matrix":[3, 14], "label":"|", "x":13.5, "y":3, "w":1.5},
-                {"matrix":[3, 15], "label":"7", "x":15.5, "y":3},
-                {"matrix":[3, 16], "label":"8", "x":16.5, "y":3},
-                {"matrix":[3, 17], "label":"9", "x":17.5, "y":3},
-                {"matrix":[3, 18], "label":"-", "x":18.5, "y":3},
+                {"matrix": [3, 0], "label": "Tab", "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 2], "label": "Q", "x": 1.5, "y": 3},
+                {"matrix": [3, 3], "label": "W", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "E", "x": 3.5, "y": 3},
+                {"matrix": [3, 5], "label": "R", "x": 4.5, "y": 3},
+                {"matrix": [3, 6], "label": "T", "x": 5.5, "y": 3},
+                {"matrix": [3, 7], "label": "Y", "x": 6.5, "y": 3},
+                {"matrix": [3, 8], "label": "U", "x": 7.5, "y": 3},
+                {"matrix": [3, 9], "label": "I", "x": 8.5, "y": 3},
+                {"matrix": [3, 10], "label": "O", "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "label": "P", "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "label": "[", "x": 11.5, "y": 3},
+                {"matrix": [3, 13], "label": "]", "x": 12.5, "y": 3},
+                {"matrix": [3, 14], "label": "|", "x": 13.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "label": "7", "x": 15.5, "y": 3},
+                {"matrix": [3, 16], "label": "8", "x": 16.5, "y": 3},
+                {"matrix": [3, 17], "label": "9", "x": 17.5, "y": 3},
+                {"matrix": [3, 18], "label": "-", "x": 18.5, "y": 3},
 
-                {"matrix":[4, 0], "label":"Caps Lock", "x":0, "y":4, "w":1.75},
-                {"matrix":[4, 2], "label":"A", "x":1.75, "y":4},
-                {"matrix":[4, 3], "label":"S", "x":2.75, "y":4},
-                {"matrix":[4, 4], "label":"D", "x":3.75, "y":4},
-                {"matrix":[4, 5], "label":"F", "x":4.75, "y":4},
-                {"matrix":[4, 6], "label":"G", "x":5.75, "y":4},
-                {"matrix":[4, 7], "label":"H", "x":6.75, "y":4},
-                {"matrix":[4, 8], "label":"J", "x":7.75, "y":4},
-                {"matrix":[4, 9], "label":"K", "x":8.75, "y":4},
-                {"matrix":[4, 10], "label":"L", "x":9.75, "y":4},
-                {"matrix":[4, 11], "label":";", "x":10.75, "y":4},
-                {"matrix":[4, 12], "label":"'", "x":11.75, "y":4},
-                {"matrix":[4, 14], "label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"matrix":[4, 15], "label":"4", "x":15.5, "y":4},
-                {"matrix":[4, 16], "label":"5", "x":16.5, "y":4},
-                {"matrix":[4, 17], "label":"6", "x":17.5, "y":4},
-                {"matrix":[4, 18], "label":"+", "x":18.5, "y":4},
+                {"matrix": [4, 0], "label": "Caps Lock", "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 2], "label": "A", "x": 1.75, "y": 4},
+                {"matrix": [4, 3], "label": "S", "x": 2.75, "y": 4},
+                {"matrix": [4, 4], "label": "D", "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "label": "F", "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "label": "G", "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "label": "H", "x": 6.75, "y": 4},
+                {"matrix": [4, 8], "label": "J", "x": 7.75, "y": 4},
+                {"matrix": [4, 9], "label": "K", "x": 8.75, "y": 4},
+                {"matrix": [4, 10], "label": "L", "x": 9.75, "y": 4},
+                {"matrix": [4, 11], "label": ";", "x": 10.75, "y": 4},
+                {"matrix": [4, 12], "label": "'", "x": 11.75, "y": 4},
+                {"matrix": [4, 14], "label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [4, 15], "label": "4", "x": 15.5, "y": 4},
+                {"matrix": [4, 16], "label": "5", "x": 16.5, "y": 4},
+                {"matrix": [4, 17], "label": "6", "x": 17.5, "y": 4},
+                {"matrix": [4, 18], "label": "+", "x": 18.5, "y": 4},
 
-                {"matrix":[5, 0], "label":"Shift", "x":0, "y":5, "w":2.25},
-                {"matrix":[5, 2], "label":"Z", "x":2.25, "y":5},
-                {"matrix":[5, 3], "label":"X", "x":3.25, "y":5},
-                {"matrix":[5, 4], "label":"C", "x":4.25, "y":5},
-                {"matrix":[5, 5], "label":"V", "x":5.25, "y":5},
-                {"matrix":[5, 6], "label":"B", "x":6.25, "y":5},
-                {"matrix":[5, 7], "label":"N", "x":7.25, "y":5},
-                {"matrix":[5, 8], "label":"M", "x":8.25, "y":5},
-                {"matrix":[5, 9], "label":"<", "x":9.25, "y":5},
-                {"matrix":[5, 10], "label":">", "x":10.25, "y":5},
-                {"matrix":[5, 11], "label":"?", "x":11.25, "y":5},
-                {"matrix":[5, 13], "label":"Shift", "x":12.25, "y":5, "w":1.75},
-                {"matrix":[5, 14], "label":"up", "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "label":"1", "x":15.5, "y":5},
-                {"matrix":[5, 16], "label":"2", "x":16.5, "y":5},
-                {"matrix":[5, 17], "label":"3", "x":17.5, "y":5},
-                {"matrix":[5, 18], "label":"Enter", "x":18.5, "y":5, "h":2},
+                {"matrix": [5, 0], "label": "Shift", "x": 0, "y": 5, "w": 2.25},
+                {"matrix": [5, 2], "label": "Z", "x": 2.25, "y": 5},
+                {"matrix": [5, 3], "label": "X", "x": 3.25, "y": 5},
+                {"matrix": [5, 4], "label": "C", "x": 4.25, "y": 5},
+                {"matrix": [5, 5], "label": "V", "x": 5.25, "y": 5},
+                {"matrix": [5, 6], "label": "B", "x": 6.25, "y": 5},
+                {"matrix": [5, 7], "label": "N", "x": 7.25, "y": 5},
+                {"matrix": [5, 8], "label": "M", "x": 8.25, "y": 5},
+                {"matrix": [5, 9], "label": "<", "x": 9.25, "y": 5},
+                {"matrix": [5, 10], "label": ">", "x": 10.25, "y": 5},
+                {"matrix": [5, 11], "label": "?", "x": 11.25, "y": 5},
+                {"matrix": [5, 13], "label": "Shift", "x": 12.25, "y": 5, "w": 1.75},
+                {"matrix": [5, 14], "label": "up", "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "1", "x": 15.5, "y": 5},
+                {"matrix": [5, 16], "label": "2", "x": 16.5, "y": 5},
+                {"matrix": [5, 17], "label": "3", "x": 17.5, "y": 5},
+                {"matrix": [5, 18], "label": "Enter", "x": 18.5, "y": 5, "h": 2},
 
-                {"matrix":[6, 0], "label":"Ctrl", "x":0, "y":6, "w":1.5},
-                {"matrix":[6, 2], "label":"Alt", "x":1.5, "y":6, "w":1.5},
-                {"matrix":[6, 6], "label":"Space", "x":3, "y":6, "w":7},
-                {"matrix":[6, 9], "label":"AltGr", "x":10, "y":6, "w":1.5},
-                {"matrix":[6, 12], "label":"Ctrl", "x":11.5, "y":6, "w":1.5},
-                {"matrix":[6, 13], "label":"left", "x":13.25, "y":6.25},
-                {"matrix":[6, 14], "label":"down", "x":14.25, "y":6.25},
-                {"matrix":[6, 15], "label":"right", "x":15.25, "y":6.25},
-                {"matrix":[6, 16], "label":"0", "x":16.5, "y":6},
-                {"matrix":[6, 17], "label":".", "x":17.5, "y":6}]
+                {"matrix": [6, 0], "label": "Ctrl", "x": 0, "y": 6, "w": 1.5},
+                {"matrix": [6, 2], "label": "Alt", "x": 1.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 6], "label": "Space", "x": 3, "y": 6, "w": 7},
+                {"matrix": [6, 9], "label": "AltGr", "x": 10, "y": 6, "w": 1.5},
+                {"matrix": [6, 12], "label": "Ctrl", "x": 11.5, "y": 6, "w": 1.5},
+                {"matrix": [6, 13], "label": "left", "x": 13.25, "y": 6.25},
+                {"matrix": [6, 14], "label": "down", "x": 14.25, "y": 6.25},
+                {"matrix": [6, 15], "label": "right", "x": 15.25, "y": 6.25},
+                {"matrix": [6, 16], "label": "0", "x": 16.5, "y": 6},
+                {"matrix": [6, 17], "label": ".", "x": 17.5, "y": 6}]
         }
     }
 }
diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json
index 4581d56b21..9ceef32703 100644
--- a/keyboards/ep/40/info.json
+++ b/keyboards/ep/40/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name":"ep40",
+    "keyboard_name": "ep40",
     "manufacturer": "Elliot Powell",
-    "maintainer":"e11i0t23",
+    "maintainer": "e11i0t23",
     "usb": {
         "vid": "0xFEED",
         "pid": "0x4040",
diff --git a/keyboards/evyd13/fin_pad/info.json b/keyboards/evyd13/fin_pad/info.json
index 461cb4f9b8..01b24ccfd0 100644
--- a/keyboards/evyd13/fin_pad/info.json
+++ b/keyboards/evyd13/fin_pad/info.json
@@ -33,55 +33,55 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"TAB", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"PEQL", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"BSPC", "x":3, "y":0},
-                {"matrix": [1, 0], "label":"NUM", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1.25},
-                {"matrix": [2, 0], "label":"P7", "x":0, "y":2.25},
-                {"matrix": [2, 1], "label":"P8", "x":1, "y":2.25},
-                {"matrix": [2, 2], "label":"P9", "x":2, "y":2.25},
-                {"matrix": [2, 3], "label":"PPLS", "x":3, "y":2.25},
-                {"matrix": [3, 0], "label":"P4", "x":0, "y":3.25},
-                {"matrix": [3, 1], "label":"P5", "x":1, "y":3.25},
-                {"matrix": [3, 2], "label":"P6", "x":2, "y":3.25},
-                {"matrix": [3, 3], "label":"PPLS", "x":3, "y":3.25},
-                {"matrix": [4, 0], "label":"P1", "x":0, "y":4.25},
-                {"matrix": [4, 1], "label":"P2", "x":1, "y":4.25},
-                {"matrix": [4, 2], "label":"P3", "x":2, "y":4.25},
-                {"matrix": [4, 3], "label":"PENT", "x":3, "y":4.25},
-                {"matrix": [5, 0], "label":"P0", "x":0, "y":5.25},
-                {"matrix": [5, 1], "label":"P0", "x":1, "y":5.25},
-                {"matrix": [5, 2], "label":"PDOT", "x":2, "y":5.25},
-                {"matrix": [5, 3], "label":"PENT", "x":3, "y":5.25}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "PEQL", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "BSPC", "x": 3, "y": 0},
+                {"matrix": [1, 0], "label": "NUM", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "label": "P7", "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "label": "P8", "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "label": "P9", "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "label": "PPLS", "x": 3, "y": 2.25},
+                {"matrix": [3, 0], "label": "P4", "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "label": "P5", "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "label": "P6", "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "label": "PPLS", "x": 3, "y": 3.25},
+                {"matrix": [4, 0], "label": "P1", "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "label": "P2", "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "label": "P3", "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "label": "PENT", "x": 3, "y": 4.25},
+                {"matrix": [5, 0], "label": "P0", "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "label": "P0", "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "label": "PDOT", "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "label": "PENT", "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"TAB", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"PEQL", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"BSPC", "x":3, "y":0},
-                {"matrix": [1, 0], "label":"NUM", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"PSLS", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"PAST", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"PMNS", "x":3, "y":1.25},
-                {"matrix": [2, 0], "label":"P7", "x":0, "y":2.25},
-                {"matrix": [2, 1], "label":"P8", "x":1, "y":2.25},
-                {"matrix": [2, 2], "label":"P9", "x":2, "y":2.25},
-                {"matrix": [3, 0], "label":"P4", "x":0, "y":3.25},
-                {"matrix": [3, 1], "label":"P5", "x":1, "y":3.25},
-                {"matrix": [3, 2], "label":"P6", "x":2, "y":3.25},
-                {"matrix": [3, 3], "label":"PPLS", "x":3, "y":2.25, "h":2},
-                {"matrix": [4, 0], "label":"P1", "x":0, "y":4.25},
-                {"matrix": [4, 1], "label":"P2", "x":1, "y":4.25},
-                {"matrix": [4, 2], "label":"P3", "x":2, "y":4.25},
-                {"matrix": [5, 0], "label":"P0", "x":0, "y":5.25},
-                {"matrix": [5, 2], "label":"PDOT", "x":2, "y":5.25},
-                {"matrix": [5, 3], "label":"PENT", "x":3, "y":4.25, "h":2}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "TAB", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "PEQL", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "BSPC", "x": 3, "y": 0},
+                {"matrix": [1, 0], "label": "NUM", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "PSLS", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "PAST", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "PMNS", "x": 3, "y": 1.25},
+                {"matrix": [2, 0], "label": "P7", "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "label": "P8", "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "label": "P9", "x": 2, "y": 2.25},
+                {"matrix": [3, 0], "label": "P4", "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "label": "P5", "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "label": "P6", "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "label": "PPLS", "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [4, 0], "label": "P1", "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "label": "P2", "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "label": "P3", "x": 2, "y": 4.25},
+                {"matrix": [5, 0], "label": "P0", "x": 0, "y": 5.25},
+                {"matrix": [5, 2], "label": "PDOT", "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "label": "PENT", "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/evyd13/nt650/info.json b/keyboards/evyd13/nt650/info.json
index a2c1fac784..6f2910b630 100644
--- a/keyboards/evyd13/nt650/info.json
+++ b/keyboards/evyd13/nt650/info.json
@@ -34,71 +34,71 @@
     "layouts": {
         "LAYOUT_ansi_split_space": {
             "layout": [
-                {"matrix": [0, 0], "label":"ESC", "x":0, "y":0},
-                {"matrix": [1, 0], "label":"1", "x":1, "y":0},
-                {"matrix": [1, 1], "label":"2", "x":2, "y":0},
-                {"matrix": [1, 2], "label":"3", "x":3, "y":0},
-                {"matrix": [1, 3], "label":"4", "x":4, "y":0},
-                {"matrix": [2, 3], "label":"5", "x":5, "y":0},
-                {"matrix": [2, 4], "label":"6", "x":6, "y":0},
-                {"matrix": [1, 4], "label":"7", "x":7, "y":0},
-                {"matrix": [1, 5], "label":"8", "x":8, "y":0},
-                {"matrix": [1, 6], "label":"9", "x":9, "y":0},
-                {"matrix": [1, 7], "label":"0", "x":10, "y":0},
-                {"matrix": [2, 7], "label":"MINS", "x":11, "y":0},
-                {"matrix": [2, 5], "label":"EQL", "x":12, "y":0},
-                {"matrix": [3, 8], "label":"BSPC", "x":13, "y":0, "w":2},
-                {"matrix": [3, 0], "label":"TAB", "x":0, "y":1, "w":1.5},
-                {"matrix": [5, 0], "label":"Q", "x":1.5, "y":1},
-                {"matrix": [5, 1], "label":"W", "x":2.5, "y":1},
-                {"matrix": [5, 2], "label":"E", "x":3.5, "y":1},
-                {"matrix": [5, 3], "label":"R", "x":4.5, "y":1},
-                {"matrix": [3, 3], "label":"T", "x":5.5, "y":1},
-                {"matrix": [3, 4], "label":"Y", "x":6.5, "y":1},
-                {"matrix": [5, 4], "label":"U", "x":7.5, "y":1},
-                {"matrix": [5, 5], "label":"I", "x":8.5, "y":1},
-                {"matrix": [5, 6], "label":"O", "x":9.5, "y":1},
-                {"matrix": [5, 7], "label":"P", "x":10.5, "y":1},
-                {"matrix": [3, 7], "label":"LBRC", "x":11.5, "y":1},
-                {"matrix": [3, 5], "label":"RBRC", "x":12.5, "y":1},
-                {"matrix": [4, 8], "label":"BSLS", "x":13.5, "y":1, "w":1.5},
-                {"matrix": [3, 1], "label":"CAPS", "x":0, "y":2, "w":1.75},
-                {"matrix": [4, 0], "label":"A", "x":1.75, "y":2},
-                {"matrix": [4, 1], "label":"S", "x":2.75, "y":2},
-                {"matrix": [4, 2], "label":"D", "x":3.75, "y":2},
-                {"matrix": [4, 3], "label":"F", "x":4.75, "y":2},
-                {"matrix": [0, 3], "label":"G", "x":5.75, "y":2},
-                {"matrix": [0, 4], "label":"H", "x":6.75, "y":2},
-                {"matrix": [4, 4], "label":"J", "x":7.75, "y":2},
-                {"matrix": [4, 5], "label":"K", "x":8.75, "y":2},
-                {"matrix": [4, 6], "label":"L", "x":9.75, "y":2},
-                {"matrix": [4, 7], "label":"SCLN", "x":10.75, "y":2},
-                {"matrix": [0, 7], "label":"QUOT", "x":11.75, "y":2},
-                {"matrix": [6, 8], "label":"ENT", "x":12.75, "y":2, "w":2.25},
-                {"matrix": [3, 10], "label":"LSFT", "x":0, "y":3, "w":2.25},
-                {"matrix": [6, 0], "label":"Z", "x":2.25, "y":3},
-                {"matrix": [6, 1], "label":"X", "x":3.25, "y":3},
-                {"matrix": [6, 2], "label":"C", "x":4.25, "y":3},
-                {"matrix": [6, 3], "label":"V", "x":5.25, "y":3},
-                {"matrix": [7, 3], "label":"B", "x":6.25, "y":3},
-                {"matrix": [7, 4], "label":"N", "x":7.25, "y":3},
-                {"matrix": [6, 4], "label":"M", "x":8.25, "y":3},
-                {"matrix": [6, 5], "label":"COMM", "x":9.25, "y":3},
-                {"matrix": [6, 6], "label":"DOT", "x":10.25, "y":3},
-                {"matrix": [7, 7], "label":"SLSH", "x":11.25, "y":3},
-                {"matrix": [4, 10], "label":"RSFT", "x":12.25, "y":3, "w":1.75},
-                {"matrix": [3, 9], "label":"APP", "x":14, "y":3},
-                {"matrix": [2, 11], "label":"LCTL", "x":0, "y":4, "w":1.25},
-                {"matrix": [3, 11], "label":"LGUI", "x":1.25, "y":4},
-                {"matrix": [0, 9], "label":"LALT", "x":2.25, "y":4, "w":1.25},
-                {"matrix": [0, 13], "label":"SPC", "x":3.5, "y":4, "w":3},
-                {"matrix": [6, 9], "label":"SPC", "x":6.5, "y":4, "w":3},
-                {"matrix": [7, 9], "label":"RALT", "x":9.5, "y":4, "w":1.25},
-                {"matrix": [6, 11], "label":"RCTL", "x":10.75, "y":4},
-                {"matrix": [0, 12], "label":"UP", "x":13, "y":4},
-                {"matrix": [7, 12], "label":"LEFT", "x":12, "y":5},
-                {"matrix": [7, 13], "label":"DOWN", "x":13, "y":5},
-                {"matrix": [7, 14], "label":"RGHT", "x":14, "y":5}
+                {"matrix": [0, 0], "label": "ESC", "x": 0, "y": 0},
+                {"matrix": [1, 0], "label": "1", "x": 1, "y": 0},
+                {"matrix": [1, 1], "label": "2", "x": 2, "y": 0},
+                {"matrix": [1, 2], "label": "3", "x": 3, "y": 0},
+                {"matrix": [1, 3], "label": "4", "x": 4, "y": 0},
+                {"matrix": [2, 3], "label": "5", "x": 5, "y": 0},
+                {"matrix": [2, 4], "label": "6", "x": 6, "y": 0},
+                {"matrix": [1, 4], "label": "7", "x": 7, "y": 0},
+                {"matrix": [1, 5], "label": "8", "x": 8, "y": 0},
+                {"matrix": [1, 6], "label": "9", "x": 9, "y": 0},
+                {"matrix": [1, 7], "label": "0", "x": 10, "y": 0},
+                {"matrix": [2, 7], "label": "MINS", "x": 11, "y": 0},
+                {"matrix": [2, 5], "label": "EQL", "x": 12, "y": 0},
+                {"matrix": [3, 8], "label": "BSPC", "x": 13, "y": 0, "w": 2},
+                {"matrix": [3, 0], "label": "TAB", "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [5, 0], "label": "Q", "x": 1.5, "y": 1},
+                {"matrix": [5, 1], "label": "W", "x": 2.5, "y": 1},
+                {"matrix": [5, 2], "label": "E", "x": 3.5, "y": 1},
+                {"matrix": [5, 3], "label": "R", "x": 4.5, "y": 1},
+                {"matrix": [3, 3], "label": "T", "x": 5.5, "y": 1},
+                {"matrix": [3, 4], "label": "Y", "x": 6.5, "y": 1},
+                {"matrix": [5, 4], "label": "U", "x": 7.5, "y": 1},
+                {"matrix": [5, 5], "label": "I", "x": 8.5, "y": 1},
+                {"matrix": [5, 6], "label": "O", "x": 9.5, "y": 1},
+                {"matrix": [5, 7], "label": "P", "x": 10.5, "y": 1},
+                {"matrix": [3, 7], "label": "LBRC", "x": 11.5, "y": 1},
+                {"matrix": [3, 5], "label": "RBRC", "x": 12.5, "y": 1},
+                {"matrix": [4, 8], "label": "BSLS", "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "label": "CAPS", "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 0], "label": "A", "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "label": "S", "x": 2.75, "y": 2},
+                {"matrix": [4, 2], "label": "D", "x": 3.75, "y": 2},
+                {"matrix": [4, 3], "label": "F", "x": 4.75, "y": 2},
+                {"matrix": [0, 3], "label": "G", "x": 5.75, "y": 2},
+                {"matrix": [0, 4], "label": "H", "x": 6.75, "y": 2},
+                {"matrix": [4, 4], "label": "J", "x": 7.75, "y": 2},
+                {"matrix": [4, 5], "label": "K", "x": 8.75, "y": 2},
+                {"matrix": [4, 6], "label": "L", "x": 9.75, "y": 2},
+                {"matrix": [4, 7], "label": "SCLN", "x": 10.75, "y": 2},
+                {"matrix": [0, 7], "label": "QUOT", "x": 11.75, "y": 2},
+                {"matrix": [6, 8], "label": "ENT", "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 10], "label": "LSFT", "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 0], "label": "Z", "x": 2.25, "y": 3},
+                {"matrix": [6, 1], "label": "X", "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "label": "C", "x": 4.25, "y": 3},
+                {"matrix": [6, 3], "label": "V", "x": 5.25, "y": 3},
+                {"matrix": [7, 3], "label": "B", "x": 6.25, "y": 3},
+                {"matrix": [7, 4], "label": "N", "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "label": "M", "x": 8.25, "y": 3},
+                {"matrix": [6, 5], "label": "COMM", "x": 9.25, "y": 3},
+                {"matrix": [6, 6], "label": "DOT", "x": 10.25, "y": 3},
+                {"matrix": [7, 7], "label": "SLSH", "x": 11.25, "y": 3},
+                {"matrix": [4, 10], "label": "RSFT", "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 9], "label": "APP", "x": 14, "y": 3},
+                {"matrix": [2, 11], "label": "LCTL", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [3, 11], "label": "LGUI", "x": 1.25, "y": 4},
+                {"matrix": [0, 9], "label": "LALT", "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [0, 13], "label": "SPC", "x": 3.5, "y": 4, "w": 3},
+                {"matrix": [6, 9], "label": "SPC", "x": 6.5, "y": 4, "w": 3},
+                {"matrix": [7, 9], "label": "RALT", "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 11], "label": "RCTL", "x": 10.75, "y": 4},
+                {"matrix": [0, 12], "label": "UP", "x": 13, "y": 4},
+                {"matrix": [7, 12], "label": "LEFT", "x": 12, "y": 5},
+                {"matrix": [7, 13], "label": "DOWN", "x": 13, "y": 5},
+                {"matrix": [7, 14], "label": "RGHT", "x": 14, "y": 5}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/promicro/info.json b/keyboards/ez_maker/directpins/promicro/info.json
index d88db4e65d..f6170810c7 100644
--- a/keyboards/ez_maker/directpins/promicro/info.json
+++ b/keyboards/ez_maker/directpins/promicro/info.json
@@ -30,16 +30,16 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"D3", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"D2", "matrix": [1, 0], "x":0, "y":1},
-                {"label":"D1", "matrix": [2, 0], "x":0, "y":4}, {"label":"F4", "matrix": [2, 1], "x":2, "y":4},
-                {"label":"D0", "matrix": [3, 0], "x":0, "y":5}, {"label":"F5", "matrix": [3, 1], "x":2, "y":5},
-                {"label":"D4", "matrix": [4, 0], "x":0, "y":6}, {"label":"F6", "matrix": [4, 1], "x":2, "y":6},
-                {"label":"C6", "matrix": [5, 0], "x":0, "y":7}, {"label":"F7", "matrix": [5, 1], "x":2, "y":7},
-                {"label":"D7", "matrix": [6, 0], "x":0, "y":8}, {"label":"B1", "matrix": [6, 1], "x":2, "y":8},
-                {"label":"E6", "matrix": [7, 0], "x":0, "y":9}, {"label":"B3", "matrix": [7, 1], "x":2, "y":9},
-                {"label":"B4", "matrix": [8, 0], "x":0, "y":10}, {"label":"B2", "matrix": [8, 1], "x":2, "y":10},
-                {"label":"B5", "matrix": [9, 0], "x":0, "y":11}, {"label":"B6", "matrix": [9, 1], "x":2, "y":11}
+                {"label": "D3", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D2", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D1", "matrix": [2, 0], "x": 0, "y": 4}, {"label": "F4", "matrix": [2, 1], "x": 2, "y": 4},
+                {"label": "D0", "matrix": [3, 0], "x": 0, "y": 5}, {"label": "F5", "matrix": [3, 1], "x": 2, "y": 5},
+                {"label": "D4", "matrix": [4, 0], "x": 0, "y": 6}, {"label": "F6", "matrix": [4, 1], "x": 2, "y": 6},
+                {"label": "C6", "matrix": [5, 0], "x": 0, "y": 7}, {"label": "F7", "matrix": [5, 1], "x": 2, "y": 7},
+                {"label": "D7", "matrix": [6, 0], "x": 0, "y": 8}, {"label": "B1", "matrix": [6, 1], "x": 2, "y": 8},
+                {"label": "E6", "matrix": [7, 0], "x": 0, "y": 9}, {"label": "B3", "matrix": [7, 1], "x": 2, "y": 9},
+                {"label": "B4", "matrix": [8, 0], "x": 0, "y": 10}, {"label": "B2", "matrix": [8, 1], "x": 2, "y": 10},
+                {"label": "B5", "matrix": [9, 0], "x": 0, "y": 11}, {"label": "B6", "matrix": [9, 1], "x": 2, "y": 11}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/rp2040/info.json b/keyboards/ez_maker/directpins/rp2040/info.json
index 14adb7cce6..bfbec888fb 100644
--- a/keyboards/ez_maker/directpins/rp2040/info.json
+++ b/keyboards/ez_maker/directpins/rp2040/info.json
@@ -41,22 +41,22 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"GP0", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"GP1", "matrix": [1, 0], "x":0, "y":1},
-                {"label":"GP2", "matrix": [2, 0], "x":0, "y":3},
-                {"label":"GP3", "matrix": [3, 0], "x":0, "y":4},
-                {"label":"GP4", "matrix": [4, 0], "x":0, "y":5},
-                {"label":"GP5", "matrix": [5, 0], "x":0, "y":6}, {"label":"GP28", "matrix": [5, 1], "x":2, "y":6},
-                {"label":"GP6", "matrix": [6, 0], "x":0, "y":8}, {"label":"GP27", "matrix": [6, 1], "x":2, "y":8},
-                {"label":"GP7", "matrix": [7, 0], "x":0, "y":9}, {"label":"GP26", "matrix": [7, 1], "x":2, "y":9},
-                {"label":"GP8", "matrix": [8, 0], "x":0, "y":10},
-                {"label":"GP9", "matrix": [9, 0], "x":0, "y":11}, {"label":"GP22", "matrix": [9, 1], "x":2, "y":11},
-                {"label":"GP10", "matrix": [10, 0], "x":0, "y":13}, {"label":"GP21", "matrix": [10, 1], "x":2, "y":13},
-                {"label":"GP11", "matrix": [11, 0], "x":0, "y":14}, {"label":"GP20", "matrix": [11, 1], "x":2, "y":14},
-                {"label":"GP12", "matrix": [12, 0], "x":0, "y":15}, {"label":"GP19", "matrix": [12, 1], "x":2, "y":15},
-                {"label":"GP13", "matrix": [13, 0], "x":0, "y":16}, {"label":"GP18", "matrix": [13, 1], "x":2, "y":16},
-                {"label":"GP14", "matrix": [14, 0], "x":0, "y":18}, {"label":"GP17", "matrix": [14, 1], "x":2, "y":18},
-                {"label":"GP15", "matrix": [15, 0], "x":0, "y":19}, {"label":"GP16", "matrix": [15, 1], "x":2, "y":19}
+                {"label": "GP0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "GP1", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "GP2", "matrix": [2, 0], "x": 0, "y": 3},
+                {"label": "GP3", "matrix": [3, 0], "x": 0, "y": 4},
+                {"label": "GP4", "matrix": [4, 0], "x": 0, "y": 5},
+                {"label": "GP5", "matrix": [5, 0], "x": 0, "y": 6}, {"label": "GP28", "matrix": [5, 1], "x": 2, "y": 6},
+                {"label": "GP6", "matrix": [6, 0], "x": 0, "y": 8}, {"label": "GP27", "matrix": [6, 1], "x": 2, "y": 8},
+                {"label": "GP7", "matrix": [7, 0], "x": 0, "y": 9}, {"label": "GP26", "matrix": [7, 1], "x": 2, "y": 9},
+                {"label": "GP8", "matrix": [8, 0], "x": 0, "y": 10},
+                {"label": "GP9", "matrix": [9, 0], "x": 0, "y": 11}, {"label": "GP22", "matrix": [9, 1], "x": 2, "y": 11},
+                {"label": "GP10", "matrix": [10, 0], "x": 0, "y": 13}, {"label": "GP21", "matrix": [10, 1], "x": 2, "y": 13},
+                {"label": "GP11", "matrix": [11, 0], "x": 0, "y": 14}, {"label": "GP20", "matrix": [11, 1], "x": 2, "y": 14},
+                {"label": "GP12", "matrix": [12, 0], "x": 0, "y": 15}, {"label": "GP19", "matrix": [12, 1], "x": 2, "y": 15},
+                {"label": "GP13", "matrix": [13, 0], "x": 0, "y": 16}, {"label": "GP18", "matrix": [13, 1], "x": 2, "y": 16},
+                {"label": "GP14", "matrix": [14, 0], "x": 0, "y": 18}, {"label": "GP17", "matrix": [14, 1], "x": 2, "y": 18},
+                {"label": "GP15", "matrix": [15, 0], "x": 0, "y": 19}, {"label": "GP16", "matrix": [15, 1], "x": 2, "y": 19}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_2/info.json b/keyboards/ez_maker/directpins/teensy_2/info.json
index 0a8983d4d7..de75c644c7 100644
--- a/keyboards/ez_maker/directpins/teensy_2/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2/info.json
@@ -33,17 +33,17 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B0", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"F0", "matrix": [0, 1], "x":4, "y":0},
-                {"label":"B1", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"F1", "matrix": [1, 1], "x":4, "y":1},
-                {"label":"B2", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"F4", "matrix": [2, 1], "x":4, "y":2},
-                {"label":"B3", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"F5", "matrix": [3, 1], "x":4, "y":3},
-                {"label":"B7", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"F6", "matrix": [4, 1], "x":4, "y":4},
-                {"label":"D0", "matrix": [5, 0], "x":0, "y":5},                                                                                                       {"label":"F7", "matrix": [5, 1], "x":4, "y":5},
-                {"label":"D1", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B6", "matrix": [6, 1], "x":4, "y":6},
-                {"label":"D2", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"B5", "matrix": [7, 1], "x":4, "y":7},
-                {"label":"D3", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"B4", "matrix": [8, 1], "x":4, "y":8},
-                {"label":"C6", "matrix": [9, 0], "x":0, "y":9},                                                                                                       {"label":"D7", "matrix": [9, 1], "x":4, "y":9},
-                {"label":"C7", "matrix": [10, 0], "x":0, "y":10}, {"label":"D5", "matrix": [11, 0], "x":1, "y":10}, {"label":"D4", "matrix": [11, 1], "x":3, "y":10}, {"label":"D6", "matrix": [10, 1], "x":4, "y":10}
+                {"label": "B0", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "F0", "matrix": [0, 1], "x": 4, "y": 0},
+                {"label": "B1", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "F1", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "B2", "matrix": [2, 0], "x": 0, "y": 2},                                                                                                       {"label": "F4", "matrix": [2, 1], "x": 4, "y": 2},
+                {"label": "B3", "matrix": [3, 0], "x": 0, "y": 3},                                                                                                       {"label": "F5", "matrix": [3, 1], "x": 4, "y": 3},
+                {"label": "B7", "matrix": [4, 0], "x": 0, "y": 4},                                                                                                       {"label": "F6", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "D0", "matrix": [5, 0], "x": 0, "y": 5},                                                                                                       {"label": "F7", "matrix": [5, 1], "x": 4, "y": 5},
+                {"label": "D1", "matrix": [6, 0], "x": 0, "y": 6},                                                                                                       {"label": "B6", "matrix": [6, 1], "x": 4, "y": 6},
+                {"label": "D2", "matrix": [7, 0], "x": 0, "y": 7},                                                                                                       {"label": "B5", "matrix": [7, 1], "x": 4, "y": 7},
+                {"label": "D3", "matrix": [8, 0], "x": 0, "y": 8},                                                                                                       {"label": "B4", "matrix": [8, 1], "x": 4, "y": 8},
+                {"label": "C6", "matrix": [9, 0], "x": 0, "y": 9},                                                                                                       {"label": "D7", "matrix": [9, 1], "x": 4, "y": 9},
+                {"label": "C7", "matrix": [10, 0], "x": 0, "y": 10}, {"label": "D5", "matrix": [11, 0], "x": 1, "y": 10}, {"label": "D4", "matrix": [11, 1], "x": 3, "y": 10}, {"label": "D6", "matrix": [10, 1], "x": 4, "y": 10}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/info.json
index 37781b4155..af288ebdbc 100644
--- a/keyboards/ez_maker/directpins/teensy_2pp/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/info.json
@@ -40,25 +40,25 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"B7", "matrix": [0, 0], "x":0, "y":0},                                                                                                       {"label":"B6", "matrix": [0, 3], "x":5, "y":0},
-                {"label":"D0", "matrix": [1, 0], "x":0, "y":1},                                                                                                       {"label":"B5", "matrix": [1, 3], "x":5, "y":1},
-                {"label":"D1", "matrix": [2, 0], "x":0, "y":2},                                                                                                       {"label":"B4", "matrix": [2, 3], "x":5, "y":2},
-                {"label":"D2", "matrix": [3, 0], "x":0, "y":3},                                                                                                       {"label":"B3", "matrix": [3, 3], "x":5, "y":3},
-                {"label":"D3", "matrix": [4, 0], "x":0, "y":4},                                                                                                       {"label":"B2", "matrix": [4, 3], "x":5, "y":4},
-                {"label":"D4", "matrix": [5, 0], "x":0, "y":5},   {"label":"E5", "matrix": [5, 1], "x":2, "y":5},   {"label":"E4", "matrix": [5, 2], "x":3, "y":5},   {"label":"B1", "matrix": [5, 3], "x":5, "y":5},
-                {"label":"D5", "matrix": [6, 0], "x":0, "y":6},                                                                                                       {"label":"B0", "matrix": [6, 3], "x":5, "y":6},
-                {"label":"D6", "matrix": [7, 0], "x":0, "y":7},                                                                                                       {"label":"E7", "matrix": [7, 3], "x":5, "y":7},
-                {"label":"D7", "matrix": [8, 0], "x":0, "y":8},                                                                                                       {"label":"E6", "matrix": [8, 3], "x":5, "y":8},
-                {"label":"E0", "matrix": [9, 0], "x":0, "y":9},
-                {"label":"E1", "matrix": [10, 0], "x":0, "y":10},
-                {"label":"C0", "matrix": [11, 0], "x":0, "y":11},                                                                                                     {"label":"F0", "matrix": [11, 3], "x":5, "y":11},
-                {"label":"C1", "matrix": [12, 0], "x":0, "y":12}, {"label":"A4", "matrix": [12, 1], "x":2, "y":12}, {"label":"A0", "matrix": [12, 2], "x":3, "y":12}, {"label":"F1", "matrix": [12, 3], "x":5, "y":12},
-                {"label":"C2", "matrix": [13, 0], "x":0, "y":13}, {"label":"A5", "matrix": [13, 1], "x":2, "y":13}, {"label":"A1", "matrix": [13, 2], "x":3, "y":13}, {"label":"F2", "matrix": [13, 3], "x":5, "y":13},
-                {"label":"C3", "matrix": [14, 0], "x":0, "y":14}, {"label":"A6", "matrix": [14, 1], "x":2, "y":14}, {"label":"A2", "matrix": [14, 2], "x":3, "y":14}, {"label":"F3", "matrix": [14, 3], "x":5, "y":14},
-                {"label":"C4", "matrix": [15, 0], "x":0, "y":15}, {"label":"A7", "matrix": [15, 1], "x":2, "y":15}, {"label":"A3", "matrix": [15, 2], "x":3, "y":15}, {"label":"F4", "matrix": [15, 3], "x":5, "y":15},
-                {"label":"C5", "matrix": [16, 0], "x":0, "y":16},                                                                                                     {"label":"F5", "matrix": [16, 3], "x":5, "y":16},
-                {"label":"C6", "matrix": [17, 0], "x":0, "y":17},                                                                                                     {"label":"F6", "matrix": [17, 3], "x":5, "y":17},
-                {"label":"C7", "matrix": [18, 0], "x":0, "y":18},                                                                                                     {"label":"F7", "matrix": [18, 3], "x":5, "y":18}
+                {"label": "B7", "matrix": [0, 0], "x": 0, "y": 0},                                                                                                       {"label": "B6", "matrix": [0, 3], "x": 5, "y": 0},
+                {"label": "D0", "matrix": [1, 0], "x": 0, "y": 1},                                                                                                       {"label": "B5", "matrix": [1, 3], "x": 5, "y": 1},
+                {"label": "D1", "matrix": [2, 0], "x": 0, "y": 2},                                                                                                       {"label": "B4", "matrix": [2, 3], "x": 5, "y": 2},
+                {"label": "D2", "matrix": [3, 0], "x": 0, "y": 3},                                                                                                       {"label": "B3", "matrix": [3, 3], "x": 5, "y": 3},
+                {"label": "D3", "matrix": [4, 0], "x": 0, "y": 4},                                                                                                       {"label": "B2", "matrix": [4, 3], "x": 5, "y": 4},
+                {"label": "D4", "matrix": [5, 0], "x": 0, "y": 5},   {"label": "E5", "matrix": [5, 1], "x": 2, "y": 5},   {"label": "E4", "matrix": [5, 2], "x": 3, "y": 5},   {"label": "B1", "matrix": [5, 3], "x": 5, "y": 5},
+                {"label": "D5", "matrix": [6, 0], "x": 0, "y": 6},                                                                                                       {"label": "B0", "matrix": [6, 3], "x": 5, "y": 6},
+                {"label": "D6", "matrix": [7, 0], "x": 0, "y": 7},                                                                                                       {"label": "E7", "matrix": [7, 3], "x": 5, "y": 7},
+                {"label": "D7", "matrix": [8, 0], "x": 0, "y": 8},                                                                                                       {"label": "E6", "matrix": [8, 3], "x": 5, "y": 8},
+                {"label": "E0", "matrix": [9, 0], "x": 0, "y": 9},
+                {"label": "E1", "matrix": [10, 0], "x": 0, "y": 10},
+                {"label": "C0", "matrix": [11, 0], "x": 0, "y": 11},                                                                                                     {"label": "F0", "matrix": [11, 3], "x": 5, "y": 11},
+                {"label": "C1", "matrix": [12, 0], "x": 0, "y": 12}, {"label": "A4", "matrix": [12, 1], "x": 2, "y": 12}, {"label": "A0", "matrix": [12, 2], "x": 3, "y": 12}, {"label": "F1", "matrix": [12, 3], "x": 5, "y": 12},
+                {"label": "C2", "matrix": [13, 0], "x": 0, "y": 13}, {"label": "A5", "matrix": [13, 1], "x": 2, "y": 13}, {"label": "A1", "matrix": [13, 2], "x": 3, "y": 13}, {"label": "F2", "matrix": [13, 3], "x": 5, "y": 13},
+                {"label": "C3", "matrix": [14, 0], "x": 0, "y": 14}, {"label": "A6", "matrix": [14, 1], "x": 2, "y": 14}, {"label": "A2", "matrix": [14, 2], "x": 3, "y": 14}, {"label": "F3", "matrix": [14, 3], "x": 5, "y": 14},
+                {"label": "C4", "matrix": [15, 0], "x": 0, "y": 15}, {"label": "A7", "matrix": [15, 1], "x": 2, "y": 15}, {"label": "A3", "matrix": [15, 2], "x": 3, "y": 15}, {"label": "F4", "matrix": [15, 3], "x": 5, "y": 15},
+                {"label": "C5", "matrix": [16, 0], "x": 0, "y": 16},                                                                                                     {"label": "F5", "matrix": [16, 3], "x": 5, "y": 16},
+                {"label": "C6", "matrix": [17, 0], "x": 0, "y": 17},                                                                                                     {"label": "F6", "matrix": [17, 3], "x": 5, "y": 17},
+                {"label": "C7", "matrix": [18, 0], "x": 0, "y": 18},                                                                                                     {"label": "F7", "matrix": [18, 3], "x": 5, "y": 18}
             ]
         }
     }
diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/info.json
index 542f7cb3e0..fc67cc0100 100644
--- a/keyboards/foostan/cornelius/info.json
+++ b/keyboards/foostan/cornelius/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name":"Cornelius",
-    "manufacturer":"Yushakobo",
-    "url":"",
-    "maintainer":"foostan",
+    "keyboard_name": "Cornelius",
+    "manufacturer": "Yushakobo",
+    "url": "",
+    "maintainer": "foostan",
     "usb": {
         "vid": "0x3265",
         "pid": "0x0005",
diff --git a/keyboards/frobiac/blackbowl/info.json b/keyboards/frobiac/blackbowl/info.json
index ccd76a7736..3d5d8483dd 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},
-                {"matrix": [6, 3], "label":"U", "x":1, "y":0.5},
-                {"matrix": [7, 3], "label":"Q", "x":2, "y":0},
-                {"matrix": [8, 3], "label":".", "x":3, "y":0},
-                {"matrix": [9, 3], "label":"J", "x":4, "y":0},
+                {"matrix": [5, 3], "label": "K", "x": 0, "y": 1},
+                {"matrix": [6, 3], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [7, 3], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [8, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [9, 3], "label": "J", "x": 4, "y": 0},
 
-                {"matrix": [0, 3], "label":"P", "x":6, "y":0},
-                {"matrix": [1, 3], "label":"C", "x":7, "y":0},
-                {"matrix": [2, 3], "label":"L", "x":8, "y":0},
-                {"matrix": [3, 3], "label":"M", "x":9, "y":0.5},
-                {"matrix": [4, 3], "label":"F", "x":10, "y":1},
+                {"matrix": [0, 3], "label": "P", "x": 6, "y": 0},
+                {"matrix": [1, 3], "label": "C", "x": 7, "y": 0},
+                {"matrix": [2, 3], "label": "L", "x": 8, "y": 0},
+                {"matrix": [3, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 3], "label": "F", "x": 10, "y": 1},
 
-                {"matrix": [5, 2], "label":"H", "x":0, "y":2},
-                {"matrix": [6, 2], "label":"I", "x":1, "y":1.5},
-                {"matrix": [7, 2], "label":"E", "x":2, "y":1},
-                {"matrix": [8, 2], "label":"A", "x":3, "y":1},
-                {"matrix": [9, 2], "label":"O", "x":4, "y":1},
+                {"matrix": [5, 2], "label": "H", "x": 0, "y": 2},
+                {"matrix": [6, 2], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [7, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [8, 2], "label": "A", "x": 3, "y": 1},
+                {"matrix": [9, 2], "label": "O", "x": 4, "y": 1},
 
-                {"matrix": [0, 2], "label":"D", "x":6, "y":1},
-                {"matrix": [1, 2], "label":"T", "x":7, "y":1},
-                {"matrix": [2, 2], "label":"R", "x":8, "y":1},
-                {"matrix": [3, 2], "label":"N", "x":9, "y":1.5},
-                {"matrix": [4, 2], "label":"S", "x":10, "y":2},
+                {"matrix": [0, 2], "label": "D", "x": 6, "y": 1},
+                {"matrix": [1, 2], "label": "T", "x": 7, "y": 1},
+                {"matrix": [2, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [3, 2], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [4, 2], "label": "S", "x": 10, "y": 2},
 
-                {"matrix": [5, 1], "label":"X", "x":0, "y":3},
-                {"matrix": [6, 1], "label":"Y", "x":1, "y":2.5},
-                {"matrix": [7, 1], "label":"-", "x":2, "y":2},
-                {"matrix": [8, 1], "label":",", "x":3, "y":2},
-                {"matrix": [9, 1], "label":"/", "x":4, "y":2},
+                {"matrix": [5, 1], "label": "X", "x": 0, "y": 3},
+                {"matrix": [6, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [7, 1], "label": "-", "x": 2, "y": 2},
+                {"matrix": [8, 1], "label": ",", "x": 3, "y": 2},
+                {"matrix": [9, 1], "label": "/", "x": 4, "y": 2},
 
-                {"matrix": [0, 1], "label":"B", "x":6, "y":2},
-                {"matrix": [1, 1], "label":"G", "x":7, "y":2},
-                {"matrix": [2, 1], "label":"W", "x":8, "y":2},
-                {"matrix": [3, 1], "label":"V", "x":9, "y":2.5},
-                {"matrix": [4, 1], "label":"Z", "x":10, "y":3},
+                {"matrix": [0, 1], "label": "B", "x": 6, "y": 2},
+                {"matrix": [1, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [2, 1], "label": "W", "x": 8, "y": 2},
+                {"matrix": [3, 1], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [4, 1], "label": "Z", "x": 10, "y": 3},
 
-                {"matrix": [5, 0], "label":" ", "x":0, "y":0},
-                {"matrix": [7, 0], "label":"Gui", "x":2, "y":3},
-                {"matrix": [8, 0], "label":"tab", "x":3, "y":3},
-                {"matrix": [9, 0], "label":"spc", "x":4, "y":3},
+                {"matrix": [5, 0], "label": " ", "x": 0, "y": 0},
+                {"matrix": [7, 0], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [8, 0], "label": "tab", "x": 3, "y": 3},
+                {"matrix": [9, 0], "label": "spc", "x": 4, "y": 3},
 
-                {"matrix": [0, 0], "label":"L2", "x":6, "y":3},
-                {"matrix": [1, 0], "label":"Sh", "x":7, "y":3},
-                {"matrix": [2, 0], "label":"L3", "x":8, "y":3},
-                {"matrix": [4, 0], "label":"Fx", "x":10, "y":0}
+                {"matrix": [0, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [1, 0], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [2, 0], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [4, 0], "label": "Fx", "x": 10, "y": 0}
        ]
     }
   }
diff --git a/keyboards/frobiac/blackflat/info.json b/keyboards/frobiac/blackflat/info.json
index 08fc2745a4..2227f698df 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},
-                {"matrix": [0, 1], "label":"U", "x":1, "y":0.5},
-                {"matrix": [0, 2], "label":"Q", "x":2, "y":0},
-                {"matrix": [0, 3], "label":".", "x":3, "y":0},
-                {"matrix": [0, 4], "label":"J", "x":4, "y":0},
+                {"matrix": [0, 0], "label": "K", "x": 0, "y": 1},
+                {"matrix": [0, 1], "label": "U", "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "label": "Q", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": ".", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "J", "x": 4, "y": 0},
 
-                {"matrix": [4, 0], "label":"P", "x":6, "y":0},
-                {"matrix": [4, 1], "label":"C", "x":7, "y":0},
-                {"matrix": [4, 2], "label":"L", "x":8, "y":0},
-                {"matrix": [4, 3], "label":"M", "x":9, "y":0.5},
-                {"matrix": [4, 4], "label":"F", "x":10, "y":1},
+                {"matrix": [4, 0], "label": "P", "x": 6, "y": 0},
+                {"matrix": [4, 1], "label": "C", "x": 7, "y": 0},
+                {"matrix": [4, 2], "label": "L", "x": 8, "y": 0},
+                {"matrix": [4, 3], "label": "M", "x": 9, "y": 0.5},
+                {"matrix": [4, 4], "label": "F", "x": 10, "y": 1},
 
-                {"matrix": [1, 0], "label":"H", "x":0, "y":2},
-                {"matrix": [1, 1], "label":"I", "x":1, "y":1.5},
-                {"matrix": [1, 2], "label":"E", "x":2, "y":1},
-                {"matrix": [1, 3], "label":"A", "x":3, "y":1},
-                {"matrix": [1, 4], "label":"O", "x":4, "y":1},
+                {"matrix": [1, 0], "label": "H", "x": 0, "y": 2},
+                {"matrix": [1, 1], "label": "I", "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "label": "E", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "A", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "O", "x": 4, "y": 1},
 
-                {"matrix": [5, 0], "label":"D", "x":6, "y":1},
-                {"matrix": [5, 1], "label":"T", "x":7, "y":1},
-                {"matrix": [5, 2], "label":"R", "x":8, "y":1},
-                {"matrix": [5, 3], "label":"N", "x":9, "y":1.5},
-                {"matrix": [5, 4], "label":"S", "x":10, "y":2},
+                {"matrix": [5, 0], "label": "D", "x": 6, "y": 1},
+                {"matrix": [5, 1], "label": "T", "x": 7, "y": 1},
+                {"matrix": [5, 2], "label": "R", "x": 8, "y": 1},
+                {"matrix": [5, 3], "label": "N", "x": 9, "y": 1.5},
+                {"matrix": [5, 4], "label": "S", "x": 10, "y": 2},
 
-                {"matrix": [2, 0], "label":"X", "x":0, "y":3},
-                {"matrix": [2, 1], "label":"Y", "x":1, "y":2.5},
-                {"matrix": [2, 2], "label":"-", "x":2, "y":2},
-                {"matrix": [2, 3], "label":",", "x":3, "y":2},
-                {"matrix": [2, 4], "label":"/", "x":4, "y":2},
+                {"matrix": [2, 0], "label": "X", "x": 0, "y": 3},
+                {"matrix": [2, 1], "label": "Y", "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "label": "-", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": ",", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "/", "x": 4, "y": 2},
 
-                {"matrix": [6, 0], "label":"B", "x":6, "y":2},
-                {"matrix": [6, 1], "label":"G", "x":7, "y":2},
-                {"matrix": [6, 2], "label":"W", "x":8, "y":2},
-                {"matrix": [6, 3], "label":"V", "x":9, "y":2.5},
-                {"matrix": [6, 4], "label":"Z", "x":10, "y":3},
+                {"matrix": [6, 0], "label": "B", "x": 6, "y": 2},
+                {"matrix": [6, 1], "label": "G", "x": 7, "y": 2},
+                {"matrix": [6, 2], "label": "W", "x": 8, "y": 2},
+                {"matrix": [6, 3], "label": "V", "x": 9, "y": 2.5},
+                {"matrix": [6, 4], "label": "Z", "x": 10, "y": 3},
 
-                {"matrix": [3, 0], "label":"", "x":0, "y":0},
-                {"matrix": [3, 2], "label":"Gui", "x":2, "y":3},
-                {"matrix": [3, 3], "label":"Tab", "x":3, "y":3},
-                {"matrix": [3, 4], "label":"Spc", "x":4, "y":3},
+                {"matrix": [3, 0], "label": "", "x": 0, "y": 0},
+                {"matrix": [3, 2], "label": "Gui", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "Tab", "x": 3, "y": 3},
+                {"matrix": [3, 4], "label": "Spc", "x": 4, "y": 3},
 
-                {"matrix": [7, 0], "label":"L2", "x":6, "y":3},
-                {"matrix": [7, 1], "label":"Sh", "x":7, "y":3},
-                {"matrix": [7, 2], "label":"L3", "x":8, "y":3},
-                {"matrix": [7, 4], "label":"Fx", "x":10, "y":0}
+                {"matrix": [7, 0], "label": "L2", "x": 6, "y": 3},
+                {"matrix": [7, 1], "label": "Sh", "x": 7, "y": 3},
+                {"matrix": [7, 2], "label": "L3", "x": 8, "y": 3},
+                {"matrix": [7, 4], "label": "Fx", "x": 10, "y": 0}
             ]
         }
     }
diff --git a/keyboards/frobiac/hypernano/info.json b/keyboards/frobiac/hypernano/info.json
index 539a70ca25..b06b281565 100644
--- a/keyboards/frobiac/hypernano/info.json
+++ b/keyboards/frobiac/hypernano/info.json
@@ -34,50 +34,50 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"K", "x":0, "y":0, "w":1.5},
-                { "matrix": [0, 1], "label":"U", "x":1.5, "y":0},
-                { "matrix": [0, 2], "label":"Q", "x":2.5, "y":0},
-                { "matrix": [0, 3], "label":".", "x":3.5, "y":0},
-                { "matrix": [0, 4], "label":"J", "x":4.5, "y":0},
-                { "matrix": [1, 1], "label":"P", "x":7.5, "y":0},
-                { "matrix": [1, 2], "label":"C", "x":8.5, "y":0},
-                { "matrix": [1, 3], "label":"L", "x":9.5, "y":0},
-                { "matrix": [1, 4], "label":"M", "x":10.5, "y":0},
-                { "matrix": [1, 5], "label":"F", "x":11.5, "y":0, "w":1.5},
-                { "matrix": [2, 0], "label":"H", "x":0, "y":1, "w":1.25},
-                { "matrix": [2, 1], "label":"I", "x":1.25, "y":1},
-                { "matrix": [2, 2], "label":"E", "x":2.25, "y":1},
-                { "matrix": [2, 3], "label":"A", "x":3.25, "y":1},
-                { "matrix": [2, 4], "label":"O", "x":4.25, "y":1},
-                { "matrix": [3, 1], "label":"D", "x":7.75, "y":1},
-                { "matrix": [3, 2], "label":"T", "x":8.75, "y":1},
-                { "matrix": [3, 3], "label":"R", "x":9.75, "y":1},
-                { "matrix": [3, 4], "label":"N", "x":10.75, "y":1},
-                { "matrix": [3, 5], "label":"S", "x":11.75, "y":1, "w":1.25},
-                { "matrix": [4, 0], "label":"X", "x":0, "y":2},
-                { "matrix": [4, 1], "label":"Y", "x":1, "y":2},
-                { "matrix": [4, 2], "label":"-", "x":2, "y":2},
-                { "matrix": [4, 3], "label":",", "x":3, "y":2},
-                { "matrix": [4, 4], "label":"/", "x":4, "y":2},
-                { "matrix": [4, 5], "label":"", "x":5, "y":2},
-                { "matrix": [5, 0], "label":"", "x":7, "y":2},
-                { "matrix": [5, 1], "label":"B", "x":8, "y":2},
-                { "matrix": [5, 2], "label":"G", "x":9, "y":2},
-                { "matrix": [5, 3], "label":"W", "x":10, "y":2},
-                { "matrix": [5, 4], "label":"V", "x":11, "y":2},
-                { "matrix": [5, 5], "label":"Z", "x":12, "y":2},
-                { "matrix": [6, 0], "label":"", "x":0, "y":3, "w":1.25},
-                { "matrix": [6, 1], "label":"", "x":1.25, "y":3},
-                { "matrix": [6, 2], "label":"Gui", "x":2.25, "y":3},
-                { "matrix": [6, 3], "label":"Tab", "x":3.25, "y":3},
-                { "matrix": [6, 4], "label":"Spc", "x":4.25, "y":3},
-                { "matrix": [6, 5], "label":"", "x":5.25, "y":3},
-                { "matrix": [7, 0], "label":"", "x":6.75, "y":3},
-                { "matrix": [7, 1], "label":"L2", "x":7.75, "y":3},
-                { "matrix": [7, 2], "label":"Sh", "x":8.75, "y":3},
-                { "matrix": [7, 3], "label":"L3", "x":9.75, "y":3},
-                { "matrix": [7, 4], "label":"", "x":10.75, "y":3},
-                { "matrix": [7, 5], "label":"", "x":11.75, "y":3, "w":1.25}
+                {"matrix": [0, 0], "label": "K", "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "label": "U", "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "label": "Q", "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "label": ".", "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "label": "J", "x": 4.5, "y": 0},
+                {"matrix": [1, 1], "label": "P", "x": 7.5, "y": 0},
+                {"matrix": [1, 2], "label": "C", "x": 8.5, "y": 0},
+                {"matrix": [1, 3], "label": "L", "x": 9.5, "y": 0},
+                {"matrix": [1, 4], "label": "M", "x": 10.5, "y": 0},
+                {"matrix": [1, 5], "label": "F", "x": 11.5, "y": 0, "w": 1.5},
+                {"matrix": [2, 0], "label": "H", "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "label": "I", "x": 1.25, "y": 1},
+                {"matrix": [2, 2], "label": "E", "x": 2.25, "y": 1},
+                {"matrix": [2, 3], "label": "A", "x": 3.25, "y": 1},
+                {"matrix": [2, 4], "label": "O", "x": 4.25, "y": 1},
+                {"matrix": [3, 1], "label": "D", "x": 7.75, "y": 1},
+                {"matrix": [3, 2], "label": "T", "x": 8.75, "y": 1},
+                {"matrix": [3, 3], "label": "R", "x": 9.75, "y": 1},
+                {"matrix": [3, 4], "label": "N", "x": 10.75, "y": 1},
+                {"matrix": [3, 5], "label": "S", "x": 11.75, "y": 1, "w": 1.25},
+                {"matrix": [4, 0], "label": "X", "x": 0, "y": 2},
+                {"matrix": [4, 1], "label": "Y", "x": 1, "y": 2},
+                {"matrix": [4, 2], "label": "-", "x": 2, "y": 2},
+                {"matrix": [4, 3], "label": ",", "x": 3, "y": 2},
+                {"matrix": [4, 4], "label": "/", "x": 4, "y": 2},
+                {"matrix": [4, 5], "label": "", "x": 5, "y": 2},
+                {"matrix": [5, 0], "label": "", "x": 7, "y": 2},
+                {"matrix": [5, 1], "label": "B", "x": 8, "y": 2},
+                {"matrix": [5, 2], "label": "G", "x": 9, "y": 2},
+                {"matrix": [5, 3], "label": "W", "x": 10, "y": 2},
+                {"matrix": [5, 4], "label": "V", "x": 11, "y": 2},
+                {"matrix": [5, 5], "label": "Z", "x": 12, "y": 2},
+                {"matrix": [6, 0], "label": "", "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "label": "", "x": 1.25, "y": 3},
+                {"matrix": [6, 2], "label": "Gui", "x": 2.25, "y": 3},
+                {"matrix": [6, 3], "label": "Tab", "x": 3.25, "y": 3},
+                {"matrix": [6, 4], "label": "Spc", "x": 4.25, "y": 3},
+                {"matrix": [6, 5], "label": "", "x": 5.25, "y": 3},
+                {"matrix": [7, 0], "label": "", "x": 6.75, "y": 3},
+                {"matrix": [7, 1], "label": "L2", "x": 7.75, "y": 3},
+                {"matrix": [7, 2], "label": "Sh", "x": 8.75, "y": 3},
+                {"matrix": [7, 3], "label": "L3", "x": 9.75, "y": 3},
+                {"matrix": [7, 4], "label": "", "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "label": "", "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/geistmaschine/geist/info.json b/keyboards/geistmaschine/geist/info.json
index 547f04bc89..77a9a937e5 100644
--- a/keyboards/geistmaschine/geist/info.json
+++ b/keyboards/geistmaschine/geist/info.json
@@ -33,237 +33,237 @@
     "layouts": {
         "LAYOUT_65_all": {
             "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "matrix":[1, 6] },
-              {"x":15.25, "y":0, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "matrix": [1, 6]},
+              {"x": 15.25, "y": 0, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "matrix":[4, 6] },
-              {"x":14, "y":2, "w":2.25, "matrix":[5, 6] },
-              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "matrix": [4, 6]},
+              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
+              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] },
-              {"x":2.5, "y":3, "matrix":[7, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
+              {"x": 2.5, "y": 3, "matrix": [7, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":2.25, "matrix":[8, 2] },
-              {"x":7.25, "y":4, "w":1.25, "matrix":[8, 3] },
-              {"x":8.5, "y":4, "w":2.75, "matrix":[8, 4] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 2.25, "matrix": [8, 2]},
+              {"x": 7.25, "y": 4, "w": 1.25, "matrix": [8, 3]},
+              {"x": 8.5, "y": 4, "w": 2.75, "matrix": [8, 4]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
             ]
         },
         "LAYOUT_65_ansi": {
             "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "w":2, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":14.75, "y":1, "w":1.5, "matrix":[3, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 14.75, "y": 1, "w": 1.5, "matrix": [3, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "w":2.25, "matrix":[5, 6] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "w": 2.25, "matrix": [5, 6]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":2.25, "matrix":[6, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 2.25, "matrix": [6, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":6.25, "matrix":[8, 3] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
           ]
         },
         "LAYOUT_65_iso": {
           "layout": [
-              {"x":0, "y":0, "matrix":[9, 1] },
-              {"x":1.25, "y":0, "matrix":[0, 0] },
-              {"x":2.25, "y":0, "matrix":[1, 0] },
-              {"x":3.25, "y":0, "matrix":[0, 1] },
-              {"x":4.25, "y":0, "matrix":[1, 1] },
-              {"x":5.25, "y":0, "matrix":[0, 2] },
-              {"x":6.25, "y":0, "matrix":[1, 2] },
-              {"x":7.25, "y":0, "matrix":[0, 3] },
-              {"x":8.25, "y":0, "matrix":[1, 3] },
-              {"x":9.25, "y":0, "matrix":[0, 4] },
-              {"x":10.25, "y":0, "matrix":[1, 4] },
-              {"x":11.25, "y":0, "matrix":[0, 5] },
-              {"x":12.25, "y":0, "matrix":[1, 5] },
-              {"x":13.25, "y":0, "matrix":[0, 6] },
-              {"x":14.25, "y":0, "w":2, "matrix":[0, 7] },
-              {"x":16.25, "y":0, "matrix":[1, 7] },
+              {"x": 0, "y": 0, "matrix": [9, 1]},
+              {"x": 1.25, "y": 0, "matrix": [0, 0]},
+              {"x": 2.25, "y": 0, "matrix": [1, 0]},
+              {"x": 3.25, "y": 0, "matrix": [0, 1]},
+              {"x": 4.25, "y": 0, "matrix": [1, 1]},
+              {"x": 5.25, "y": 0, "matrix": [0, 2]},
+              {"x": 6.25, "y": 0, "matrix": [1, 2]},
+              {"x": 7.25, "y": 0, "matrix": [0, 3]},
+              {"x": 8.25, "y": 0, "matrix": [1, 3]},
+              {"x": 9.25, "y": 0, "matrix": [0, 4]},
+              {"x": 10.25, "y": 0, "matrix": [1, 4]},
+              {"x": 11.25, "y": 0, "matrix": [0, 5]},
+              {"x": 12.25, "y": 0, "matrix": [1, 5]},
+              {"x": 13.25, "y": 0, "matrix": [0, 6]},
+              {"x": 14.25, "y": 0, "w": 2, "matrix": [0, 7]},
+              {"x": 16.25, "y": 0, "matrix": [1, 7]},
 
-              {"x":1.25, "y":1, "w":1.5, "matrix":[2, 0] },
-              {"x":2.75, "y":1, "matrix":[3, 0] },
-              {"x":3.75, "y":1, "matrix":[2, 1] },
-              {"x":4.75, "y":1, "matrix":[3, 1] },
-              {"x":5.75, "y":1, "matrix":[2, 2] },
-              {"x":6.75, "y":1, "matrix":[3, 2] },
-              {"x":7.75, "y":1, "matrix":[2, 3] },
-              {"x":8.75, "y":1, "matrix":[3, 3] },
-              {"x":9.75, "y":1, "matrix":[2, 4] },
-              {"x":10.75, "y":1, "matrix":[3, 4] },
-              {"x":11.75, "y":1, "matrix":[2, 5] },
-              {"x":12.75, "y":1, "matrix":[3, 5] },
-              {"x":13.75, "y":1, "matrix":[2, 6] },
-              {"x":16.25, "y":1, "matrix":[3, 7] },
+              {"x": 1.25, "y": 1, "w": 1.5, "matrix": [2, 0]},
+              {"x": 2.75, "y": 1, "matrix": [3, 0]},
+              {"x": 3.75, "y": 1, "matrix": [2, 1]},
+              {"x": 4.75, "y": 1, "matrix": [3, 1]},
+              {"x": 5.75, "y": 1, "matrix": [2, 2]},
+              {"x": 6.75, "y": 1, "matrix": [3, 2]},
+              {"x": 7.75, "y": 1, "matrix": [2, 3]},
+              {"x": 8.75, "y": 1, "matrix": [3, 3]},
+              {"x": 9.75, "y": 1, "matrix": [2, 4]},
+              {"x": 10.75, "y": 1, "matrix": [3, 4]},
+              {"x": 11.75, "y": 1, "matrix": [2, 5]},
+              {"x": 12.75, "y": 1, "matrix": [3, 5]},
+              {"x": 13.75, "y": 1, "matrix": [2, 6]},
+              {"x": 16.25, "y": 1, "matrix": [3, 7]},
 
-              {"x":1.25, "y":2, "w":1.75, "matrix":[4, 0] },
-              {"x":3, "y":2, "matrix":[5, 0] },
-              {"x":4, "y":2, "matrix":[4, 1] },
-              {"x":5, "y":2, "matrix":[5, 1] },
-              {"x":6, "y":2, "matrix":[4, 2] },
-              {"x":7, "y":2, "matrix":[5, 2] },
-              {"x":8, "y":2, "matrix":[4, 3] },
-              {"x":9, "y":2, "matrix":[5, 3] },
-              {"x":10, "y":2, "matrix":[4, 4] },
-              {"x":11, "y":2, "matrix":[5, 4] },
-              {"x":12, "y":2, "matrix":[4, 5] },
-              {"x":13, "y":2, "matrix":[5, 5] },
-              {"x":14, "y":2, "matrix":[4, 6] },
-              {"x":15, "y":1, "w":1.25, "h":2, "matrix":[4, 7] },
-              {"x":16.25, "y":2, "matrix":[5, 7] },
+              {"x": 1.25, "y": 2, "w": 1.75, "matrix": [4, 0]},
+              {"x": 3, "y": 2, "matrix": [5, 0]},
+              {"x": 4, "y": 2, "matrix": [4, 1]},
+              {"x": 5, "y": 2, "matrix": [5, 1]},
+              {"x": 6, "y": 2, "matrix": [4, 2]},
+              {"x": 7, "y": 2, "matrix": [5, 2]},
+              {"x": 8, "y": 2, "matrix": [4, 3]},
+              {"x": 9, "y": 2, "matrix": [5, 3]},
+              {"x": 10, "y": 2, "matrix": [4, 4]},
+              {"x": 11, "y": 2, "matrix": [5, 4]},
+              {"x": 12, "y": 2, "matrix": [4, 5]},
+              {"x": 13, "y": 2, "matrix": [5, 5]},
+              {"x": 14, "y": 2, "matrix": [4, 6]},
+              {"x": 15, "y": 1, "w": 1.25, "h": 2, "matrix": [4, 7]},
+              {"x": 16.25, "y": 2, "matrix": [5, 7]},
 
-              {"x":1.25, "y":3, "w":1.25, "matrix":[6, 0] },
-              {"x":2.5, "y":3, "matrix":[7, 0] },
-              {"x":3.5, "y":3, "matrix":[6, 1] },
-              {"x":4.5, "y":3, "matrix":[7, 1] },
-              {"x":5.5, "y":3, "matrix":[6, 2] },
-              {"x":6.5, "y":3, "matrix":[7, 2] },
-              {"x":7.5, "y":3, "matrix":[6, 3] },
-              {"x":8.5, "y":3, "matrix":[7, 3] },
-              {"x":9.5, "y":3, "matrix":[6, 4] },
-              {"x":10.5, "y":3, "matrix":[7, 4] },
-              {"x":11.5, "y":3, "matrix":[6, 5] },
-              {"x":12.5, "y":3, "matrix":[7, 5] },
-              {"x":13.5, "y":3, "w":1.75, "matrix":[6, 6] },
-              {"x":15.25, "y":3, "matrix":[6, 7] },
-              {"x":16.25, "y":3, "matrix":[7, 7] },
+              {"x": 1.25, "y": 3, "w": 1.25, "matrix": [6, 0]},
+              {"x": 2.5, "y": 3, "matrix": [7, 0]},
+              {"x": 3.5, "y": 3, "matrix": [6, 1]},
+              {"x": 4.5, "y": 3, "matrix": [7, 1]},
+              {"x": 5.5, "y": 3, "matrix": [6, 2]},
+              {"x": 6.5, "y": 3, "matrix": [7, 2]},
+              {"x": 7.5, "y": 3, "matrix": [6, 3]},
+              {"x": 8.5, "y": 3, "matrix": [7, 3]},
+              {"x": 9.5, "y": 3, "matrix": [6, 4]},
+              {"x": 10.5, "y": 3, "matrix": [7, 4]},
+              {"x": 11.5, "y": 3, "matrix": [6, 5]},
+              {"x": 12.5, "y": 3, "matrix": [7, 5]},
+              {"x": 13.5, "y": 3, "w": 1.75, "matrix": [6, 6]},
+              {"x": 15.25, "y": 3, "matrix": [6, 7]},
+              {"x": 16.25, "y": 3, "matrix": [7, 7]},
 
-              {"x":1.25, "y":4, "w":1.25, "matrix":[8, 0] },
-              {"x":2.5, "y":4, "w":1.25, "matrix":[9, 0] },
-              {"x":3.75, "y":4, "w":1.25, "matrix":[8, 1] },
-              {"x":5, "y":4, "w":6.25, "matrix":[8, 3] },
-              {"x":11.25, "y":4, "w":1.25, "matrix":[8, 5] },
-              {"x":12.5, "y":4, "w":1.25, "matrix":[9, 5] },
-              {"x":14.25, "y":4, "matrix":[9, 6] },
-              {"x":15.25, "y":4, "matrix":[8, 7] },
-              {"x":16.25, "y":4, "matrix":[9, 7] }
+              {"x": 1.25, "y": 4, "w": 1.25, "matrix": [8, 0]},
+              {"x": 2.5, "y": 4, "w": 1.25, "matrix": [9, 0]},
+              {"x": 3.75, "y": 4, "w": 1.25, "matrix": [8, 1]},
+              {"x": 5, "y": 4, "w": 6.25, "matrix": [8, 3]},
+              {"x": 11.25, "y": 4, "w": 1.25, "matrix": [8, 5]},
+              {"x": 12.5, "y": 4, "w": 1.25, "matrix": [9, 5]},
+              {"x": 14.25, "y": 4, "matrix": [9, 6]},
+              {"x": 15.25, "y": 4, "matrix": [8, 7]},
+              {"x": 16.25, "y": 4, "matrix": [9, 7]}
           ]
         }
     }
diff --git a/keyboards/geistmaschine/macropod/info.json b/keyboards/geistmaschine/macropod/info.json
index 39e67c048a..886ed5acaf 100644
--- a/keyboards/geistmaschine/macropod/info.json
+++ b/keyboards/geistmaschine/macropod/info.json
@@ -27,10 +27,10 @@
     "layouts": {
         "LAYOUT_fourkey": {
             "layout": [
-              {"x":0, "y":0, "matrix":[0, 0]},
-              {"x":0, "y":1.25, "matrix":[0, 1]},
-              {"x":0, "y":2.25, "matrix":[0, 2]},
-              {"x":0, "y":3.25, "matrix":[0, 3]}
+              {"x": 0, "y": 0, "matrix": [0, 0]},
+              {"x": 0, "y": 1.25, "matrix": [0, 1]},
+              {"x": 0, "y": 2.25, "matrix": [0, 2]},
+              {"x": 0, "y": 3.25, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/ghs/jem/info.json b/keyboards/ghs/jem/info.json
index d65f543776..b90655647d 100644
--- a/keyboards/ghs/jem/info.json
+++ b/keyboards/ghs/jem/info.json
@@ -48,230 +48,230 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0 },
-                { "matrix": [0, 1], "x":1, "y":0 },
-                { "matrix": [0, 2], "x":2, "y":0 },
-                { "matrix": [0, 3], "x":3, "y":0 },
-                { "matrix": [0, 4], "x":4, "y":0 },
-                { "matrix": [0, 5], "x":5, "y":0 },
-                { "matrix": [0, 6], "x":6, "y":0 },
-                { "matrix": [0, 7], "x":7, "y":0 },
-                { "matrix": [0, 8], "x":8, "y":0 },
-                { "matrix": [0, 9], "x":9, "y":0 },
-                { "matrix": [0, 10], "x":10, "y":0 },
-                { "matrix": [0, 11], "x":11, "y":0 },
-                { "matrix": [0, 12], "x":12, "y":0 },
-                { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-                { "matrix": [1, 14], "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "matrix": [1, 1], "x":1.5, "y":1 },
-                { "matrix": [1, 2], "x":2.5, "y":1 },
-                { "matrix": [1, 3], "x":3.5, "y":1 },
-                { "matrix": [1, 4], "x":4.5, "y":1 },
-                { "matrix": [1, 5], "x":5.5, "y":1 },
-                { "matrix": [1, 6], "x":6.5, "y":1 },
-                { "matrix": [1, 7], "x":7.5, "y":1 },
-                { "matrix": [1, 8], "x":8.5, "y":1 },
-                { "matrix": [1, 9], "x":9.5, "y":1 },
-                { "matrix": [1, 10], "x":10.5, "y":1 },
-                { "matrix": [1, 11], "x":11.5, "y":1 },
-                { "matrix": [1, 12], "x":12.5, "y":1 },
-                { "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
-                { "matrix": [2, 14], "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "matrix": [2, 1], "x":1.75, "y":2 },
-                { "matrix": [2, 2], "x":2.75, "y":2 },
-                { "matrix": [2, 3], "x":3.75, "y":2 },
-                { "matrix": [2, 4], "x":4.75, "y":2 },
-                { "matrix": [2, 5], "x":5.75, "y":2 },
-                { "matrix": [2, 6], "x":6.75, "y":2 },
-                { "matrix": [2, 7], "x":7.75, "y":2 },
-                { "matrix": [2, 8], "x":8.75, "y":2 },
-                { "matrix": [2, 9], "x":9.75, "y":2 },
-                { "matrix": [2, 10], "x":10.75, "y":2 },
-                { "matrix": [2, 11], "x":11.75, "y":2 },
-                { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-                { "matrix": [3, 2], "x":2.25, "y":3 },
-                { "matrix": [3, 3], "x":3.25, "y":3 },
-                { "matrix": [3, 4], "x":4.25, "y":3 },
-                { "matrix": [3, 5], "x":5.25, "y":3 },
-                { "matrix": [3, 6], "x":6.25, "y":3 },
-                { "matrix": [3, 7], "x":7.25, "y":3 },
-                { "matrix": [3, 8], "x":8.25, "y":3 },
-                { "matrix": [3, 9], "x":9.25, "y":3 },
-                { "matrix": [3, 10], "x":10.25, "y":3 },
-                { "matrix": [3, 11], "x":11.25, "y":3 },
-                { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-                { "matrix": [3, 13], "x":14, "y":3 },
-                { "matrix": [4, 14], "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-                { "matrix": [4, 9], "x":10, "y":4, "w":1.25 },
-                { "matrix": [4, 10], "x":11.25, "y":4, "w":1.25 },
-                { "matrix": [4, 11], "x":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0 },
-                { "matrix": [0, 1], "x":1, "y":0 },
-                { "matrix": [0, 2], "x":2, "y":0 },
-                { "matrix": [0, 3], "x":3, "y":0 },
-                { "matrix": [0, 4], "x":4, "y":0 },
-                { "matrix": [0, 5], "x":5, "y":0 },
-                { "matrix": [0, 6], "x":6, "y":0 },
-                { "matrix": [0, 7], "x":7, "y":0 },
-                { "matrix": [0, 8], "x":8, "y":0 },
-                { "matrix": [0, 9], "x":9, "y":0 },
-                { "matrix": [0, 10], "x":10, "y":0 },
-                { "matrix": [0, 11], "x":11, "y":0 },
-                { "matrix": [0, 12], "x":12, "y":0 },
-                { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-                { "matrix": [1, 14], "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "matrix": [1, 1], "x":1.5, "y":1 },
-                { "matrix": [1, 2], "x":2.5, "y":1 },
-                { "matrix": [1, 3], "x":3.5, "y":1 },
-                { "matrix": [1, 4], "x":4.5, "y":1 },
-                { "matrix": [1, 5], "x":5.5, "y":1 },
-                { "matrix": [1, 6], "x":6.5, "y":1 },
-                { "matrix": [1, 7], "x":7.5, "y":1 },
-                { "matrix": [1, 8], "x":8.5, "y":1 },
-                { "matrix": [1, 9], "x":9.5, "y":1 },
-                { "matrix": [1, 10], "x":10.5, "y":1 },
-                { "matrix": [1, 11], "x":11.5, "y":1 },
-                { "matrix": [1, 12], "x":12.5, "y":1 },
-                { "matrix": [2, 14], "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "matrix": [2, 1], "x":1.75, "y":2 },
-                { "matrix": [2, 2], "x":2.75, "y":2 },
-                { "matrix": [2, 3], "x":3.75, "y":2 },
-                { "matrix": [2, 4], "x":4.75, "y":2 },
-                { "matrix": [2, 5], "x":5.75, "y":2 },
-                { "matrix": [2, 6], "x":6.75, "y":2 },
-                { "matrix": [2, 7], "x":7.75, "y":2 },
-                { "matrix": [2, 8], "x":8.75, "y":2 },
-                { "matrix": [2, 9], "x":9.75, "y":2 },
-                { "matrix": [2, 10], "x":10.75, "y":2 },
-                { "matrix": [2, 11], "x":11.75, "y":2 },
-                { "matrix": [2, 13], "x":12.75, "y":2 },
-                { "matrix": [1, 13], "x":13.75, "y":1, "w":1.25, "h":2 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-                { "matrix": [3, 1], "x":1.25, "y":3 },
-                { "matrix": [3, 2], "x":2.25, "y":3 },
-                { "matrix": [3, 3], "x":3.25, "y":3 },
-                { "matrix": [3, 4], "x":4.25, "y":3 },
-                { "matrix": [3, 5], "x":5.25, "y":3 },
-                { "matrix": [3, 6], "x":6.25, "y":3 },
-                { "matrix": [3, 7], "x":7.25, "y":3 },
-                { "matrix": [3, 8], "x":8.25, "y":3 },
-                { "matrix": [3, 9], "x":9.25, "y":3 },
-                { "matrix": [3, 10], "x":10.25, "y":3 },
-                { "matrix": [3, 11], "x":11.25, "y":3 },
-                { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-                { "matrix": [3, 13], "x":14, "y":3 },
-                { "matrix": [4, 14], "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-                { "matrix": [4, 9], "x":10, "y":4, "w":1.25 },
-                { "matrix": [4, 10], "x":11.25, "y":4, "w":1.25 },
-                { "matrix": [4, 11], "x":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         },
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0 },
-                { "matrix": [0, 1], "x":1, "y":0 },
-                { "matrix": [0, 2], "x":2, "y":0 },
-                { "matrix": [0, 3], "x":3, "y":0 },
-                { "matrix": [0, 4], "x":4, "y":0 },
-                { "matrix": [0, 5], "x":5, "y":0 },
-                { "matrix": [0, 6], "x":6, "y":0 },
-                { "matrix": [0, 7], "x":7, "y":0 },
-                { "matrix": [0, 8], "x":8, "y":0 },
-                { "matrix": [0, 9], "x":9, "y":0 },
-                { "matrix": [0, 10], "x":10, "y":0 },
-                { "matrix": [0, 11], "x":11, "y":0 },
-                { "matrix": [0, 12], "x":12, "y":0 },
-                { "matrix": [0, 13], "x":13, "y":0 },
-                { "matrix": [0, 14], "x":14, "y":0 },
-                { "matrix": [1, 14], "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [1, 14], "x": 15, "y": 0},
 
-                { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "matrix": [1, 1], "x":1.5, "y":1 },
-                { "matrix": [1, 2], "x":2.5, "y":1 },
-                { "matrix": [1, 3], "x":3.5, "y":1 },
-                { "matrix": [1, 4], "x":4.5, "y":1 },
-                { "matrix": [1, 5], "x":5.5, "y":1 },
-                { "matrix": [1, 6], "x":6.5, "y":1 },
-                { "matrix": [1, 7], "x":7.5, "y":1 },
-                { "matrix": [1, 8], "x":8.5, "y":1 },
-                { "matrix": [1, 9], "x":9.5, "y":1 },
-                { "matrix": [1, 10], "x":10.5, "y":1 },
-                { "matrix": [1, 11], "x":11.5, "y":1 },
-                { "matrix": [1, 12], "x":12.5, "y":1 },
-                { "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
-                { "matrix": [2, 14], "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 1},
 
-                { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "matrix": [2, 1], "x":1.75, "y":2 },
-                { "matrix": [2, 2], "x":2.75, "y":2 },
-                { "matrix": [2, 3], "x":3.75, "y":2 },
-                { "matrix": [2, 4], "x":4.75, "y":2 },
-                { "matrix": [2, 5], "x":5.75, "y":2 },
-                { "matrix": [2, 6], "x":6.75, "y":2 },
-                { "matrix": [2, 7], "x":7.75, "y":2 },
-                { "matrix": [2, 8], "x":8.75, "y":2 },
-                { "matrix": [2, 9], "x":9.75, "y":2 },
-                { "matrix": [2, 10], "x":10.75, "y":2 },
-                { "matrix": [2, 11], "x":11.75, "y":2 },
-                { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [3, 14], "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 2},
 
-                { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-                { "matrix": [3, 1], "x":1.25, "y":3 },
-                { "matrix": [3, 2], "x":2.25, "y":3 },
-                { "matrix": [3, 3], "x":3.25, "y":3 },
-                { "matrix": [3, 4], "x":4.25, "y":3 },
-                { "matrix": [3, 5], "x":5.25, "y":3 },
-                { "matrix": [3, 6], "x":6.25, "y":3 },
-                { "matrix": [3, 7], "x":7.25, "y":3 },
-                { "matrix": [3, 8], "x":8.25, "y":3 },
-                { "matrix": [3, 9], "x":9.25, "y":3 },
-                { "matrix": [3, 10], "x":10.25, "y":3 },
-                { "matrix": [3, 11], "x":11.25, "y":3 },
-                { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-                { "matrix": [3, 13], "x":14, "y":3 },
-                { "matrix": [4, 14], "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [4, 14], "x": 15, "y": 3},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-                { "matrix": [4, 9], "x":10, "y":4, "w":1.25 },
-                { "matrix": [4, 10], "x":11.25, "y":4, "w":1.25 },
-                { "matrix": [4, 11], "x":13, "y":4 },
-                { "matrix": [4, 12], "x":14, "y":4 },
-                { "matrix": [4, 13], "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 12], "x": 14, "y": 4},
+                {"matrix": [4, 13], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gl516/xr63gl/info.json b/keyboards/gl516/xr63gl/info.json
index 746f137807..ddeb425462 100644
--- a/keyboards/gl516/xr63gl/info.json
+++ b/keyboards/gl516/xr63gl/info.json
@@ -29,69 +29,69 @@
     "layouts": {
         "LAYOUT_63_ansi": {
             "layout": [
-                { "label":"ESC", "matrix": [0, 1], "x": 0, "y": 0 },
-                { "label":"1!", "matrix": [0, 2], "x": 1, "y": 0 },
-                { "label":"2@", "matrix": [0, 3], "x": 2, "y": 0 },
-                { "label":"3#", "matrix": [0, 4], "x": 3, "y": 0 },
-                { "label":"4$", "matrix": [0, 5], "x": 4, "y": 0 },
-                { "label":"5%", "matrix": [0, 6], "x": 5, "y": 0 },
-                { "label":"6^", "matrix": [0, 7], "x": 6, "y": 0 },
-                { "label":"7&", "matrix": [0, 8], "x": 7, "y": 0 },
-                { "label":"8*", "matrix": [1, 0], "x": 8, "y": 0 },
-                { "label":"9(", "matrix": [1, 2], "x": 9, "y": 0 },
-                { "label":"0)", "matrix": [1, 3], "x": 10, "y": 0 },
-                { "label":"-_", "matrix": [1, 4], "x": 11, "y": 0 },
-                { "label":"=+", "matrix": [1, 5], "x": 12, "y": 0 },
-                { "label":"Backspace", "matrix": [1, 6], "w": 2, "x": 13, "y": 0 },
-                { "label":"Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "label":"Q", "matrix": [2, 1], "x": 1.5, "y": 1 },
-                { "label":"W", "matrix": [2, 3], "x": 2.5, "y": 1 },
-                { "label":"E", "matrix": [2, 4], "x": 3.5, "y": 1 },
-                { "label":"R", "matrix": [2, 5], "x": 4.5, "y": 1 },
-                { "label":"T", "matrix": [2, 6], "x": 5.5, "y": 1 },
-                { "label":"Y", "matrix": [2, 7], "x": 6.5, "y": 1 },
-                { "label":"U", "matrix": [2, 8], "x": 7.5, "y": 1 },
-                { "label":"I", "matrix": [3, 0], "x": 8.5, "y": 1 },
-                { "label":"O", "matrix": [3, 1], "x": 9.5, "y": 1 },
-                { "label":"P", "matrix": [3, 2], "x": 10.5, "y": 1 },
-                { "label":"[{", "matrix": [3, 4], "x": 11.5, "y": 1 },
-                { "label":"]}", "matrix": [3, 5], "x": 12.5, "y": 1 },
-                { "label":"\\|", "matrix": [3, 6], "w": 1.5, "x": 13.5, "y": 1 },
-                { "label":"Caps Lock", "matrix": [4, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "label":"A", "matrix": [4, 1], "x": 1.75, "y": 2 },
-                { "label":"S", "matrix": [4, 2], "x": 2.75, "y": 2 },
-                { "label":"D", "matrix": [4, 3], "x": 3.75, "y": 2 },
-                { "label":"F", "matrix": [4, 5], "x": 4.75, "y": 2 },
-                { "label":"G", "matrix": [4, 6], "x": 5.75, "y": 2 },
-                { "label":"H", "matrix": [4, 7], "x": 6.75, "y": 2 },
-                { "label":"J", "matrix": [4, 8], "x": 7.75, "y": 2 },
-                { "label":"K", "matrix": [5, 0], "x": 8.75, "y": 2 },
-                { "label":"L", "matrix": [5, 1], "x": 9.75, "y": 2 },
-                { "label":";:", "matrix": [5, 2], "x": 10.75, "y": 2 },
-                { "label":"'\"", "matrix": [5, 3], "x": 11.75, "y": 2 },
-                { "label":"Enter", "matrix": [5, 4], "w": 2.25, "x": 12.75, "y": 2 },
-                { "label":"Shift", "matrix": [6, 0], "w": 2.25, "x": 0, "y": 3 },
-                { "label":"Z", "matrix": [6, 1], "x": 2.25, "y": 3 },
-                { "label":"X", "matrix": [6, 2], "x": 3.25, "y": 3 },
-                { "label":"C", "matrix": [6, 3], "x": 4.25, "y": 3 },
-                { "label":"V", "matrix": [6, 4], "x": 5.25, "y": 3 },
-                { "label":"B", "matrix": [6, 5], "x": 6.25, "y": 3 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 3 },
-                { "label":"M", "matrix": [6, 8], "x": 8.25, "y": 3 },
-                { "label":",<", "matrix": [7, 0], "x": 9.25, "y": 3 },
-                { "label":".>", "matrix": [7, 1], "x": 10.25, "y": 3 },
-                { "label":"/?", "matrix": [7, 2], "x": 11.25, "y": 3 },
-                { "label":"Shift", "matrix": [7, 3], "w": 1.25, "x": 12.25, "y": 3 },
-                { "label":"Up", "matrix": [7, 4], "x": 14, "y": 3 },
-                { "label":"Ctrl", "matrix": [8, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "label":"Win", "matrix": [8, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "label":"Alt", "matrix": [8, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "label":"Space", "matrix": [8, 3], "w": 6.25, "x": 3.75, "y": 4 },
-                { "label":"MO(2)", "matrix": [8, 4], "w": 1.25, "x": 10, "y": 4 },
-                { "label":"MO(1)", "matrix": [8, 5], "w": 1.25, "x": 11.25, "y": 4 },
-                { "label":"Left", "matrix": [8, 6], "x": 13, "y": 4 },
-                { "label":"Down", "matrix": [8, 7], "x": 14, "y": 4 },
-                { "label":"Right", "matrix": [7, 5], "x": 15, "y": 4 }
+                {"label": "ESC", "matrix": [0, 1], "x": 0, "y": 0},
+                {"label": "1!", "matrix": [0, 2], "x": 1, "y": 0},
+                {"label": "2@", "matrix": [0, 3], "x": 2, "y": 0},
+                {"label": "3#", "matrix": [0, 4], "x": 3, "y": 0},
+                {"label": "4$", "matrix": [0, 5], "x": 4, "y": 0},
+                {"label": "5%", "matrix": [0, 6], "x": 5, "y": 0},
+                {"label": "6^", "matrix": [0, 7], "x": 6, "y": 0},
+                {"label": "7&", "matrix": [0, 8], "x": 7, "y": 0},
+                {"label": "8*", "matrix": [1, 0], "x": 8, "y": 0},
+                {"label": "9(", "matrix": [1, 2], "x": 9, "y": 0},
+                {"label": "0)", "matrix": [1, 3], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [1, 4], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [1, 5], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "w": 2, "x": 13, "y": 0},
+                {"label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 1},
+                {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [2, 4], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 5], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [2, 6], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 7], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [2, 8], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [3, 0], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 1], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [3, 2], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [3, 4], "x": 11.5, "y": 1},
+                {"label": "]}", "matrix": [3, 5], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [3, 6], "w": 1.5, "x": 13.5, "y": 1},
+                {"label": "Caps Lock", "matrix": [4, 0], "w": 1.75, "x": 0, "y": 2},
+                {"label": "A", "matrix": [4, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [4, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 5], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [4, 6], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 7], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [4, 8], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [5, 0], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 1], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [5, 2], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [5, 3], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 4], "w": 2.25, "x": 12.75, "y": 2},
+                {"label": "Shift", "matrix": [6, 0], "w": 2.25, "x": 0, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [6, 2], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [6, 4], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 5], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [7, 0], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [7, 1], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [7, 2], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [7, 3], "w": 1.25, "x": 12.25, "y": 3},
+                {"label": "Up", "matrix": [7, 4], "x": 14, "y": 3},
+                {"label": "Ctrl", "matrix": [8, 0], "w": 1.25, "x": 0, "y": 4},
+                {"label": "Win", "matrix": [8, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"label": "Alt", "matrix": [8, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"label": "Space", "matrix": [8, 3], "w": 6.25, "x": 3.75, "y": 4},
+                {"label": "MO(2)", "matrix": [8, 4], "w": 1.25, "x": 10, "y": 4},
+                {"label": "MO(1)", "matrix": [8, 5], "w": 1.25, "x": 11.25, "y": 4},
+                {"label": "Left", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "Down", "matrix": [8, 7], "x": 14, "y": 4},
+                {"label": "Right", "matrix": [7, 5], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/gray_studio/aero75/info.json b/keyboards/gray_studio/aero75/info.json
index 0ac953a102..6f03045d5b 100644
--- a/keyboards/gray_studio/aero75/info.json
+++ b/keyboards/gray_studio/aero75/info.json
@@ -2,7 +2,7 @@
     "keyboard_name": "Aero 75",
     "url": "https://graystudio.site/en/aero75/",
     "maintainer": "edwardslau",
-    "manufacturer":"GrayStudio",
+    "manufacturer": "GrayStudio",
     "usb": {
         "vid": "0x4753",
         "pid": "0x3075",
diff --git a/keyboards/gray_studio/space65r3/info.json b/keyboards/gray_studio/space65r3/info.json
index 286538e203..825e631762 100644
--- a/keyboards/gray_studio/space65r3/info.json
+++ b/keyboards/gray_studio/space65r3/info.json
@@ -2,10 +2,10 @@
     "keyboard_name": "Space65R3",
     "url": "https://graystudio.site/en/works/space65r3/",
     "maintainer": "edwardslau",
-    "manufacturer":"GrayStudio",
+    "manufacturer": "GrayStudio",
     "usb": {
-        "vid":"0x4753",
-        "pid":"0x3003",
+        "vid": "0x4753",
+        "pid": "0x3003",
         "device_version": "0.0.3",
     },
     "ws2812": {
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/info.json
index 20ccb509e6..af75560e84 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/info.json
@@ -31,17 +31,17 @@
   "layouts": {
     "LAYOUT_split_1x5": {
       "layout": [
-        {"matrix": [0, 0], "x":0, "y":0.25},
-        {"matrix": [0, 1], "x":1, "y":0.125},
-        {"matrix": [0, 2], "x":2, "y":0},
-        {"matrix": [0, 3], "x":3, "y":0.5},
-        {"matrix": [0, 4], "x":3.75, "y":2.75},
+        {"matrix": [0, 0], "x": 0, "y": 0.25},
+        {"matrix": [0, 1], "x": 1, "y": 0.125},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.5},
+        {"matrix": [0, 4], "x": 3.75, "y": 2.75},
 
-        {"matrix": [1, 0], "x":5.75, "y":2.75},
-        {"matrix": [1, 1], "x":6.5, "y":0.5},
-        {"matrix": [1, 2], "x":7.5, "y":0},
-        {"matrix": [1, 3], "x":8.5, "y":0.125},
-        {"matrix": [1, 4], "x":9.5, "y":0.25}
+        {"matrix": [1, 0], "x": 5.75, "y": 2.75},
+        {"matrix": [1, 1], "x": 6.5, "y": 0.5},
+        {"matrix": [1, 2], "x": 7.5, "y": 0},
+        {"matrix": [1, 3], "x": 8.5, "y": 0.125},
+        {"matrix": [1, 4], "x": 9.5, "y": 0.25}
       ]
     }
   }
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
index a90a831f8a..173abdfb60 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/info.json
@@ -18,7 +18,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json
index be2a1ee8fd..8d59a107f7 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/info.json
@@ -29,8 +29,8 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"x":0, "y":0.375},
-            {"x":16.5, "y":0.38}
+            {"x": 0, "y": 0.375},
+            {"x": 16.5, "y": 0.38}
         ]
     },
     "ws2812": {
@@ -38,96 +38,96 @@
         "driver": "vendor"
     },
     "layouts": {
-        "LAYOUT":{
-            "layout":[
-                {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0},
-                {"matrix":[0, 3], "x":3.5, "y":0.125},
-                {"matrix":[0, 4], "x":4.5, "y":0.125},
-                {"matrix":[0, 5], "x":5.5, "y":0.125},
-                {"matrix":[0, 6], "x":6.5, "y":0.125},
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.125},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.125},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.125},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.125},
 
-                {"matrix":[6, 6], "x":10.5, "y":0.125},
-                {"matrix":[6, 5], "x":11.5, "y":0.125},
-                {"matrix":[6, 4], "x":12.5, "y":0.125},
-                {"matrix":[6, 3], "x":13.5, "y":0.125},
-                {"matrix":[6, 2], "x":14.5, "y":0},
-                {"matrix":[6, 1], "x":15.5, "y":0.25},
-                {"matrix":[6, 0], "x":16.5, "y":0.25, "w":1.5},
+                {"matrix": [6, 6], "x": 10.5, "y": 0.125},
+                {"matrix": [6, 5], "x": 11.5, "y": 0.125},
+                {"matrix": [6, 4], "x": 12.5, "y": 0.125},
+                {"matrix": [6, 3], "x": 13.5, "y": 0.125},
+                {"matrix": [6, 2], "x": 14.5, "y": 0},
+                {"matrix": [6, 1], "x": 15.5, "y": 0.25},
+                {"matrix": [6, 0], "x": 16.5, "y": 0.25, "w": 1.5},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1.125},
-                {"matrix":[1, 4], "x":4.5, "y":1.125},
-                {"matrix":[1, 5], "x":5.5, "y":1.125},
-                {"matrix":[1, 6], "x":6.5, "y":1.125},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.125},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.125},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.125},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.125},
 
-                {"matrix":[7, 6], "x":10.5, "y":1.125},
-                {"matrix":[7, 5], "x":11.5, "y":1.125},
-                {"matrix":[7, 4], "x":12.5, "y":1.125},
-                {"matrix":[7, 3], "x":13.5, "y":1.125},
-                {"matrix":[7, 2], "x":14.5, "y":1},
-                {"matrix":[7, 1], "x":15.5, "y":1.25},
-                {"matrix":[7, 0], "x":16.5, "y":1.25, "w":1.5},
+                {"matrix": [7, 6], "x": 10.5, "y": 1.125},
+                {"matrix": [7, 5], "x": 11.5, "y": 1.125},
+                {"matrix": [7, 4], "x": 12.5, "y": 1.125},
+                {"matrix": [7, 3], "x": 13.5, "y": 1.125},
+                {"matrix": [7, 2], "x": 14.5, "y": 1},
+                {"matrix": [7, 1], "x": 15.5, "y": 1.25},
+                {"matrix": [7, 0], "x": 16.5, "y": 1.25, "w": 1.5},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2.125},
-                {"matrix":[2, 4], "x":4.5, "y":2.125},
-                {"matrix":[2, 5], "x":5.5, "y":2.125},
-                {"matrix":[2, 6], "x":6.5, "y":2.125},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.125},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.125},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.125},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.125},
 
-                {"matrix":[8, 6], "x":10.5, "y":2.125},
-                {"matrix":[8, 5], "x":11.5, "y":2.125},
-                {"matrix":[8, 4], "x":12.5, "y":2.125},
-                {"matrix":[8, 3], "x":13.5, "y":2.125},
-                {"matrix":[8, 2], "x":14.5, "y":2},
-                {"matrix":[8, 1], "x":15.5, "y":2.25},
-                {"matrix":[8, 0], "x":16.5, "y":2.25, "w":1.5},
+                {"matrix": [8, 6], "x": 10.5, "y": 2.125},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.125},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.125},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.125},
+                {"matrix": [8, 2], "x": 14.5, "y": 2},
+                {"matrix": [8, 1], "x": 15.5, "y": 2.25},
+                {"matrix": [8, 0], "x": 16.5, "y": 2.25, "w": 1.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.5},
-                {"matrix":[3, 1], "x":1.5, "y":3.25},
-                {"matrix":[3, 2], "x":2.5, "y":3},
-                {"matrix":[3, 3], "x":3.5, "y":3.125},
-                {"matrix":[3, 4], "x":4.5, "y":3.125},
-                {"matrix":[3, 5], "x":5.5, "y":3.125},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.125},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.125},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.125},
 
-                {"matrix":[9, 5], "x":11.5, "y":3.125},
-                {"matrix":[9, 4], "x":12.5, "y":3.125},
-                {"matrix":[9, 3], "x":13.5, "y":3.125},
-                {"matrix":[9, 2], "x":14.5, "y":3},
-                {"matrix":[9, 1], "x":15.5, "y":3.25},
-                {"matrix":[9, 0], "x":16.5, "y":3.25, "w":1.5},
+                {"matrix": [9, 5], "x": 11.5, "y": 3.125},
+                {"matrix": [9, 4], "x": 12.5, "y": 3.125},
+                {"matrix": [9, 3], "x": 13.5, "y": 3.125},
+                {"matrix": [9, 2], "x": 14.5, "y": 3},
+                {"matrix": [9, 1], "x": 15.5, "y": 3.25},
+                {"matrix": [9, 0], "x": 16.5, "y": 3.25, "w": 1.5},
 
-                {"matrix":[4, 0], "x":0.5, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25},
-                {"matrix":[4, 2], "x":2.5, "y":4},
-                {"matrix":[4, 3], "x":3.5, "y":4.125},
+                {"matrix": [4, 0], "x": 0.5, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.125},
 
-                {"matrix":[10, 3], "x":13.5, "y":4.125},
-                {"matrix":[10, 2], "x":14.5, "y":4},
-                {"matrix":[10, 1], "x":15.5, "y":4.25},
-                {"matrix":[10, 0], "x":16.5, "y":4.25},
+                {"matrix": [10, 3], "x": 13.5, "y": 4.125},
+                {"matrix": [10, 2], "x": 14.5, "y": 4},
+                {"matrix": [10, 1], "x": 15.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 16.5, "y": 4.25},
 
-                {"matrix":[4, 4], "x":5, "y":4.375, "h":2},
-                {"matrix":[4, 5], "x":6.25, "y":4.375, "h":1.5},
-                {"matrix":[10, 5], "x":10.75, "y":4.375, "h":1.5},
-                {"matrix":[10, 4], "x":12, "y":4.375, "h":2},
+                {"matrix": [4, 4], "x": 5, "y": 4.375, "h": 2},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 5], "x": 10.75, "y": 4.375, "h": 1.5},
+                {"matrix": [10, 4], "x": 12, "y": 4.375, "h": 2},
 
-                {"matrix":[5, 4], "x":6.25, "y":6.125},
-                {"matrix":[5, 5], "x":7.5, "y":6.125},
+                {"matrix": [5, 4], "x": 6.25, "y": 6.125},
+                {"matrix": [5, 5], "x": 7.5, "y": 6.125},
 
-                {"matrix":[11, 5], "x":9.5, "y":6.125},
-                {"matrix":[11, 4], "x":10.75, "y":6.125},
+                {"matrix": [11, 5], "x": 9.5, "y": 6.125},
+                {"matrix": [11, 4], "x": 10.75, "y": 6.125},
 
-                {"matrix":[5, 2], "x":6.25, "y":7.125},
-                {"matrix":[5, 3], "x":7.25, "y":7.125},
+                {"matrix": [5, 2], "x": 6.25, "y": 7.125},
+                {"matrix": [5, 3], "x": 7.25, "y": 7.125},
 
-                {"matrix":[11, 3], "x":9.75, "y":7.125},
-                {"matrix":[11, 2], "x":10.75, "y":7.125}
+                {"matrix": [11, 3], "x": 9.75, "y": 7.125},
+                {"matrix": [11, 2], "x": 10.75, "y": 7.125}
             ]
         }
     }
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 3f51e00aa6..ab7747d43a 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -8,30 +8,8 @@
         "term": 175
     },
     "matrix_pins": {
-        "cols": [
-            "B6",
-            "B7",
-            "C6",
-            "C7",
-            "D0",
-            "D1",
-            "D2",
-            "D3",
-            "D4",
-            "D5",
-            "D6",
-            "D7",
-            "E6",
-            "F0"
-        ],
-        "rows": [
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "B4",
-            "B5"
-        ]
+        "cols": ["B6", "B7", "C6", "C7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
     },
     "usb": {
         "vid": "0x1209",
@@ -65,633 +43,83 @@
     "layouts": {
         "LAYOUT_abnt2": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 13,
-                    "y": 1.25,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 13.75,
-                    "y": 2.25,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 12.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 1.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 13.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 1.25,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 2.5,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 12.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 13.25,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        13
-                    ],
-                    "x": 14.25,
-                    "y": 5.25
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json
index 4e218e1dd8..eb6e57abde 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/info.json
@@ -24,15 +24,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
index 778a9a0412..555731bdd5 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -27,12 +27,12 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]}
       ]
     }
   }
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/info.json
index 1f56982b6d..6744d4b701 100644
--- a/keyboards/handwired/dactylmacropad/info.json
+++ b/keyboards/handwired/dactylmacropad/info.json
@@ -11,7 +11,7 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "encoder":true
+        "encoder": true
     },
     "matrix_pins": {
         "cols": ["F7", "B1", "B3", "B2", "B6"],
@@ -31,19 +31,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
index cfe18929d0..8308506512 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -46,111 +46,111 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label":"Esc", "matrix": [5, 16], "x": 0, "y": 0 },
-                { "label":"F1", "matrix": [2, 4], "x": 2, "y": 0 },
-                { "label":"F2", "matrix": [2, 5], "x": 3, "y": 0 },
-                { "label":"F3", "matrix": [3, 5], "x": 4, "y": 0 },
-                { "label":"F4", "matrix": [5, 5], "x": 5, "y": 0 },
-                { "label":"F5", "matrix": [0, 1], "x": 6.5, "y": 0 },
-                { "label":"F6", "matrix": [5, 8], "x": 7.5, "y": 0 },
-                { "label":"F7", "matrix": [3, 3], "x": 8.5, "y": 0 },
-                { "label":"F8", "matrix": [2, 3], "x": 9.5, "y": 0 },
-                { "label":"F9", "matrix": [2, 2], "x": 11, "y": 0 },
-                { "label":"F10", "matrix": [0, 2], "x": 12, "y": 0 },
-                { "label":"F11", "matrix": [5, 2], "x": 13, "y": 0 },
-                { "label":"F12", "matrix": [6, 2], "x": 14, "y": 0 },
-                { "label":"Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0 },
-                { "label":"Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0 },
-                { "label":"Pause", "matrix": [1, 1], "x": 17.25, "y": 0 },
-                { "label":"`", "matrix": [2, 16], "x": 0, "y": 1.25 },
-                { "label":"1", "matrix": [0, 16], "x": 1, "y": 1.25 },
-                { "label":"2", "matrix": [0, 4], "x": 2, "y": 1.25 },
-                { "label":"3", "matrix": [0, 5], "x": 3, "y": 1.25 },
-                { "label":"4", "matrix": [0, 6], "x": 4, "y": 1.25 },
-                { "label":"5", "matrix": [2, 6], "x": 5, "y": 1.25 },
-                { "label":"6", "matrix": [2, 7], "x": 6, "y": 1.25 },
-                { "label":"7", "matrix": [0, 7], "x": 7, "y": 1.25 },
-                { "label":"8", "matrix": [0, 8], "x": 8, "y": 1.25 },
-                { "label":"9", "matrix": [0, 3], "x": 9, "y": 1.25 },
-                { "label":"0", "matrix": [0, 9], "x": 10, "y": 1.25 },
-                { "label":"-", "matrix": [2, 9], "x": 11, "y": 1.25 },
-                { "label":"=", "matrix": [2, 8], "x": 12, "y": 1.25 },
-                { "label":"Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25 },
-                { "label":"Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25 },
-                { "label":"Home", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
-                { "label":"Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25 },
-                { "label":"Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25 },
-                { "label":"/", "matrix": [4, 11], "x": 19.5, "y": 1.25 },
-                { "label":"*", "matrix": [4, 14], "x": 20.5, "y": 1.25 },
-                { "label":"-", "matrix": [6, 14], "x": 21.5, "y": 1.25 },
-                { "label":"Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label":"Q", "matrix": [1, 16], "x": 1.5, "y": 2.25 },
-                { "label":"W", "matrix": [1, 4], "x": 2.5, "y": 2.25 },
-                { "label":"E", "matrix": [1, 5], "x": 3.5, "y": 2.25 },
-                { "label":"R", "matrix": [1, 6], "x": 4.5, "y": 2.25 },
-                { "label":"T", "matrix": [3, 6], "x": 5.5, "y": 2.25 },
-                { "label":"Y", "matrix": [3, 7], "x": 6.5, "y": 2.25 },
-                { "label":"U", "matrix": [1, 7], "x": 7.5, "y": 2.25 },
-                { "label":"I", "matrix": [1, 8], "x": 8.5, "y": 2.25 },
-                { "label":"O", "matrix": [1, 3], "x": 9.5, "y": 2.25 },
-                { "label":"P", "matrix": [1, 9], "x": 10.5, "y": 2.25 },
-                { "label":"[", "matrix": [3, 9], "x": 11.5, "y": 2.25 },
-                { "label":"]", "matrix": [3, 8], "x": 12.5, "y": 2.25 },
-                { "label":"Del", "matrix": [2, 10], "x": 15.25, "y": 2.25 },
-                { "label":"End", "matrix": [0, 15], "x": 16.25, "y": 2.25 },
-                { "label":"Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25 },
-                { "label":"7", "matrix": [1, 10], "x": 18.5, "y": 2.25 },
-                { "label":"8", "matrix": [1, 11], "x": 19.5, "y": 2.25 },
-                { "label":"9", "matrix": [1, 14], "x": 20.5, "y": 2.25 },
-                { "label":"+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25 },
-                { "label":"Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label":"A", "matrix": [7, 16], "x": 1.75, "y": 3.25 },
-                { "label":"S", "matrix": [7, 4], "x": 2.75, "y": 3.25 },
-                { "label":"D", "matrix": [7, 5], "x": 3.75, "y": 3.25 },
-                { "label":"F", "matrix": [7, 6], "x": 4.75, "y": 3.25 },
-                { "label":"G", "matrix": [5, 6], "x": 5.75, "y": 3.25 },
-                { "label":"H", "matrix": [5, 7], "x": 6.75, "y": 3.25 },
-                { "label":"J", "matrix": [7, 7], "x": 7.75, "y": 3.25 },
-                { "label":"K", "matrix": [7, 8], "x": 8.75, "y": 3.25 },
-                { "label":"L", "matrix": [7, 3], "x": 9.75, "y": 3.25 },
-                { "label":";", "matrix": [7, 9], "x": 10.75, "y": 3.25 },
-                { "label":"'", "matrix": [5, 9], "x": 11.75, "y": 3.25 },
-                { "label":"#", "matrix": [1, 2], "x": 12.75, "y": 3.25 },
-                { "label":"Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25 },
-                { "label":"4", "matrix": [3, 10], "x": 18.5, "y": 3.25 },
-                { "label":"5", "matrix": [3, 11], "x": 19.5, "y": 3.25 },
-                { "label":"6", "matrix": [3, 14], "x": 20.5, "y": 3.25 },
-                { "label":"Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25 },
-                { "label":"\\", "matrix": [5, 4], "x": 1.25, "y": 4.25 },
-                { "label":"Z", "matrix": [4, 16], "x": 2.25, "y": 4.25 },
-                { "label":"X", "matrix": [4, 4], "x": 3.25, "y": 4.25 },
-                { "label":"C", "matrix": [4, 5], "x": 4.25, "y": 4.25 },
-                { "label":"V", "matrix": [4, 6], "x": 5.25, "y": 4.25 },
-                { "label":"B", "matrix": [6, 6], "x": 6.25, "y": 4.25 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 4.25 },
-                { "label":"M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label":",", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label":".", "matrix": [4, 3], "x": 10.25, "y": 4.25 },
-                { "label":"/", "matrix": [6, 9], "x": 11.25, "y": 4.25 },
-                { "label":"Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label":"Up", "matrix": [5, 15], "x": 16.25, "y": 4.25 },
-                { "label":"1", "matrix": [7, 10], "x": 18.5, "y": 4.25 },
-                { "label":"2", "matrix": [7, 11], "x": 19.5, "y": 4.25 },
-                { "label":"3", "matrix": [7, 14], "x": 20.5, "y": 4.25 },
-                { "label":"Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25 },
-                { "label":"Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label":"Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label":"Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label":" ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label":"Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label":"Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label":"Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label":"Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label":"Left", "matrix": [6, 15], "x": 15.25, "y": 5.25 },
-                { "label":"Down", "matrix": [6, 10], "x": 16.25, "y": 5.25 },
-                { "label":"Right", "matrix": [6, 11], "x": 17.25, "y": 5.25 },
-                { "label":"0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25 },
-                { "label":"Del", "matrix": [5, 14], "x": 20.5, "y": 5.25 }
+                {"label": "Esc", "matrix": [5, 16], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [2, 4], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [5, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 1], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [5, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [3, 3], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [2, 3], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [2, 2], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [5, 2], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 2], "x": 14, "y": 0},
+                {"label": "Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0},
+                {"label": "Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [1, 1], "x": 17.25, "y": 0},
+                {"label": "`", "matrix": [2, 16], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [0, 16], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [0, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [0, 5], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [0, 6], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [2, 6], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [2, 7], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [0, 3], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [0, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [2, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+                {"label": "Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25},
+                {"label": "Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25},
+                {"label": "/", "matrix": [4, 11], "x": 19.5, "y": 1.25},
+                {"label": "*", "matrix": [4, 14], "x": 20.5, "y": 1.25},
+                {"label": "-", "matrix": [6, 14], "x": 21.5, "y": 1.25},
+                {"label": "Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "Q", "matrix": [1, 16], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [3, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [3, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [1, 3], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [1, 9], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [3, 9], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [3, 8], "x": 12.5, "y": 2.25},
+                {"label": "Del", "matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [0, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25},
+                {"label": "7", "matrix": [1, 10], "x": 18.5, "y": 2.25},
+                {"label": "8", "matrix": [1, 11], "x": 19.5, "y": 2.25},
+                {"label": "9", "matrix": [1, 14], "x": 20.5, "y": 2.25},
+                {"label": "+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "A", "matrix": [7, 16], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [7, 4], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [7, 5], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [7, 6], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [7, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 9], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 9], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [1, 2], "x": 12.75, "y": 3.25},
+                {"label": "Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4", "matrix": [3, 10], "x": 18.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 11], "x": 19.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 14], "x": 20.5, "y": 3.25},
+                {"label": "Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "\\", "matrix": [5, 4], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 16], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 3], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [6, 9], "x": 11.25, "y": 4.25},
+                {"label": "Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "Up", "matrix": [5, 15], "x": 16.25, "y": 4.25},
+                {"label": "1", "matrix": [7, 10], "x": 18.5, "y": 4.25},
+                {"label": "2", "matrix": [7, 11], "x": 19.5, "y": 4.25},
+                {"label": "3", "matrix": [7, 14], "x": 20.5, "y": 4.25},
+                {"label": "Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25},
+                {"label": "Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+                {"label": "Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+                {"label": "Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+                {"label": " ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+                {"label": "Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+                {"label": "Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+                {"label": "Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+                {"label": "Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+                {"label": "Left", "matrix": [6, 15], "x": 15.25, "y": 5.25},
+                {"label": "Down", "matrix": [6, 10], "x": 16.25, "y": 5.25},
+                {"label": "Right", "matrix": [6, 11], "x": 17.25, "y": 5.25},
+                {"label": "0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+                {"label": "Del", "matrix": [5, 14], "x": 20.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
index 6ef96b29d7..991be93b52 100644
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -14,19 +14,7 @@
     },
     "matrix_pins": {
         // TX0, RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1
-        "cols": [
-            "D3",
-            "D2",
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5",
-            "F4",
-            "F5",
-            "F6"
-        ],
+        "cols": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6"],
         // A0, 15, 14, 16, 10
         "rows": ["F7", "B1", "B3", "B2", "B6"]
     },
@@ -44,54 +32,54 @@
         "LAYOUT_ortho_4_3x10_4": {
             "layout": [
                 // Row 1 (Macros)
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
 
                 // Row 2
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [1, 4], "x": 4, "y": 1 },
-                { "matrix": [1, 5], "x": 5, "y": 1 },
-                { "matrix": [1, 6], "x": 6, "y": 1 },
-                { "matrix": [1, 7], "x": 7, "y": 1 },
-                { "matrix": [1, 8], "x": 8, "y": 1 },
-                { "matrix": [1, 9], "x": 9, "y": 1 },
-                { "matrix": [1, 10], "x": 10, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
 
                 // Row 3
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [2, 4], "x": 4, "y": 2 },
-                { "matrix": [2, 5], "x": 5, "y": 2 },
-                { "matrix": [2, 6], "x": 6, "y": 2 },
-                { "matrix": [2, 7], "x": 7, "y": 2 },
-                { "matrix": [2, 8], "x": 8, "y": 2 },
-                { "matrix": [2, 9], "x": 9, "y": 2 },
-                { "matrix": [2, 10], "x": 10, "y": 2 },
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
 
                 // Row 4
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [3, 4], "x": 4, "y": 3 },
-                { "matrix": [3, 5], "x": 5, "y": 3 },
-                { "matrix": [3, 6], "x": 6, "y": 3 },
-                { "matrix": [3, 7], "x": 7, "y": 3 },
-                { "matrix": [3, 8], "x": 8, "y": 3 },
-                { "matrix": [3, 9], "x": 9, "y": 3 },
-                { "matrix": [3, 10], "x": 10, "y": 3 },
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
 
                 // Row 5
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 5], "x": 5, "y": 4 },
-                { "matrix": [4, 9], "x": 9, "y": 4 },
-                { "matrix": [4, 10], "x": 10, "y": 4 }
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json
index 7b62bfeb7a..057552e621 100644
--- a/keyboards/handwired/maverick0197/keydeck8/info.json
+++ b/keyboards/handwired/maverick0197/keydeck8/info.json
@@ -29,9 +29,17 @@
     "layouts": {
         "LAYOUT": {
         "layout": [
-                {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0},
-                {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1},
-                {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2}
+                {"label": "D0", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "D1", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "D4", "matrix": [0, 2], "x": 2, "y": 0},
+
+                {"label": "C6", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "D7", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "E6", "matrix": [1, 2], "x": 2, "y": 1},
+
+                {"label": "B4", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "B5", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "B6", "matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json
index a72ceb4fc7..eae71d9508 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/info.json
@@ -27,85 +27,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":1, "w":1.5, "matrix": [0, 0]},
-                {"x":1.5, "y":0.75, "matrix": [0, 1]},
-                {"x":2.5, "y":0.25, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "matrix": [0, 3]},
-                {"x":4.5, "y":0.25, "matrix": [0, 4]},
-                {"x":5.5, "y":0.75, "matrix": [0, 5]},
-                {"x":6.5, "y":1, "matrix": [0, 6]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0.75, "matrix": [0, 1]},
+                {"x": 2.5, "y": 0.25, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0.25, "matrix": [0, 4]},
+                {"x": 5.5, "y": 0.75, "matrix": [0, 5]},
+                {"x": 6.5, "y": 1, "matrix": [0, 6]},
 
-                {"x":9.5, "y":1, "matrix": [5, 0]},
-                {"x":10.5, "y":0.75, "matrix": [5, 1]},
-                {"x":11.5, "y":0.25, "matrix": [5, 2]},
-                {"x":12.5, "y":0, "matrix": [5, 3]},
-                {"x":13.5, "y":0.25, "matrix": [5, 4]},
-                {"x":14.5, "y":0.75, "matrix": [5, 5]},
-                {"x":15.5, "y":1, "w":1.5, "matrix": [5, 6]},
+                {"x": 9.5, "y": 1, "matrix": [5, 0]},
+                {"x": 10.5, "y": 0.75, "matrix": [5, 1]},
+                {"x": 11.5, "y": 0.25, "matrix": [5, 2]},
+                {"x": 12.5, "y": 0, "matrix": [5, 3]},
+                {"x": 13.5, "y": 0.25, "matrix": [5, 4]},
+                {"x": 14.5, "y": 0.75, "matrix": [5, 5]},
+                {"x": 15.5, "y": 1, "w": 1.5, "matrix": [5, 6]},
 
-                {"x":0, "y":2, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1.75, "matrix": [1, 1]},
-                {"x":2.5, "y":1.25, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1.25, "matrix": [1, 4]},
-                {"x":5.5, "y":1.75, "matrix": [1, 5]},
-                {"x":6.5, "y":2, "h":1.5, "matrix": [1, 6]},
+                {"x": 0, "y": 2, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1.75, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1.75, "matrix": [1, 5]},
+                {"x": 6.5, "y": 2, "h": 1.5, "matrix": [1, 6]},
 
-                {"x":9.5, "y":2, "h":1.5, "matrix": [6, 0]},
-                {"x":10.5, "y":1.75, "matrix": [6, 1]},
-                {"x":11.5, "y":1.25, "matrix": [6, 2]},
-                {"x":12.5, "y":1, "matrix": [6, 3]},
-                {"x":13.5, "y":1.25, "matrix": [6, 4]},
-                {"x":14.5, "y":1.75, "matrix": [6, 5]},
-                {"x":15.5, "y":2, "w":1.5, "matrix": [6, 6]},
+                {"x": 9.5, "y": 2, "h": 1.5, "matrix": [6, 0]},
+                {"x": 10.5, "y": 1.75, "matrix": [6, 1]},
+                {"x": 11.5, "y": 1.25, "matrix": [6, 2]},
+                {"x": 12.5, "y": 1, "matrix": [6, 3]},
+                {"x": 13.5, "y": 1.25, "matrix": [6, 4]},
+                {"x": 14.5, "y": 1.75, "matrix": [6, 5]},
+                {"x": 15.5, "y": 2, "w": 1.5, "matrix": [6, 6]},
 
-                {"x":0, "y":3, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.75, "matrix": [2, 1]},
-                {"x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"x":3.5, "y":2, "matrix": [2, 3]},
-                {"x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"x":5.5, "y":2.75, "matrix": [2, 5]},
+                {"x": 0, "y": 3, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.75, "matrix": [2, 1]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 3.5, "y": 2, "matrix": [2, 3]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 5.5, "y": 2.75, "matrix": [2, 5]},
 
-                {"x":10.5, "y":2.75, "matrix": [7, 1]},
-                {"x":11.5, "y":2.25, "matrix": [7, 2]},
-                {"x":12.5, "y":2, "matrix": [7, 3]},
-                {"x":13.5, "y":2.25, "matrix": [7, 4]},
-                {"x":14.5, "y":2.75, "matrix": [7, 5]},
-                {"x":15.5, "y":3, "w":1.5, "matrix": [7, 6]},
+                {"x": 10.5, "y": 2.75, "matrix": [7, 1]},
+                {"x": 11.5, "y": 2.25, "matrix": [7, 2]},
+                {"x": 12.5, "y": 2, "matrix": [7, 3]},
+                {"x": 13.5, "y": 2.25, "matrix": [7, 4]},
+                {"x": 14.5, "y": 2.75, "matrix": [7, 5]},
+                {"x": 15.5, "y": 3, "w": 1.5, "matrix": [7, 6]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [3, 0]},
-                {"x":1.5, "y":3.75, "matrix": [3, 1]},
-                {"x":2.5, "y":3.25, "matrix": [3, 2]},
-                {"x":3.5, "y":3, "matrix": [3, 3]},
-                {"x":4.5, "y":3.25, "matrix": [3, 4]},
-                {"x":5.5, "y":3.75, "matrix": [3, 5]},
-                {"x":6.5, "y":3.5, "h":1.5, "matrix": [3, 6]},
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [3, 0]},
+                {"x": 1.5, "y": 3.75, "matrix": [3, 1]},
+                {"x": 2.5, "y": 3.25, "matrix": [3, 2]},
+                {"x": 3.5, "y": 3, "matrix": [3, 3]},
+                {"x": 4.5, "y": 3.25, "matrix": [3, 4]},
+                {"x": 5.5, "y": 3.75, "matrix": [3, 5]},
+                {"x": 6.5, "y": 3.5, "h": 1.5, "matrix": [3, 6]},
 
-                {"x":9.5, "y":3.5, "h":1.5, "matrix": [8, 0]},
-                {"x":10.5, "y":3.75, "matrix": [8, 1]},
-                {"x":11.5, "y":3.25, "matrix": [8, 2]},
-                {"x":12.5, "y":3, "matrix": [8, 3]},
-                {"x":13.5, "y":3.25, "matrix": [8, 4]},
-                {"x":14.5, "y":3.75, "matrix": [8, 5]},
-                {"x":15.5, "y":4, "w":1.5, "matrix": [8, 6]},
+                {"x": 9.5, "y": 3.5, "h": 1.5, "matrix": [8, 0]},
+                {"x": 10.5, "y": 3.75, "matrix": [8, 1]},
+                {"x": 11.5, "y": 3.25, "matrix": [8, 2]},
+                {"x": 12.5, "y": 3, "matrix": [8, 3]},
+                {"x": 13.5, "y": 3.25, "matrix": [8, 4]},
+                {"x": 14.5, "y": 3.75, "matrix": [8, 5]},
+                {"x": 15.5, "y": 4, "w": 1.5, "matrix": [8, 6]},
 
-                {"x":0.25, "y":5, "matrix": [4, 0]},
-                {"x":1.5, "y":4.75, "matrix": [4, 1]},
-                {"x":2.5, "y":4.25, "matrix": [4, 2]},
-                {"x":3.5, "y":4, "matrix": [4, 3]},
+                {"x": 0.25, "y": 5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4.75, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.5, "y": 4, "matrix": [4, 3]},
 
-                {"x":5, "y":6, "matrix": [4, 4]},
-                {"x":6, "y":5.5, "h":2, "matrix": [4, 5]},
-                {"x":7, "y":5.5, "h":2, "matrix": [4, 6]},
+                {"x": 5, "y": 6, "matrix": [4, 4]},
+                {"x": 6, "y": 5.5, "h": 2, "matrix": [4, 5]},
+                {"x": 7, "y": 5.5, "h": 2, "matrix": [4, 6]},
 
-                {"x":9, "y":5.5, "h":2, "matrix": [9, 0]},
-                {"x":10, "y":5.5, "h":2, "matrix": [9, 1]},
-                {"x":11, "y":6, "matrix": [9, 2]},
+                {"x": 9, "y": 5.5, "h": 2, "matrix": [9, 0]},
+                {"x": 10, "y": 5.5, "h": 2, "matrix": [9, 1]},
+                {"x": 11, "y": 6, "matrix": [9, 2]},
 
-                {"x":12.5, "y":4, "matrix": [9, 3]},
-                {"x":13.5, "y":4.25, "matrix": [9, 4]},
-                {"x":14.5, "y":4.75, "matrix": [9, 5]},
-                {"x":15.75, "y":5, "matrix": [9, 6]}
+                {"x": 12.5, "y": 4, "matrix": [9, 3]},
+                {"x": 13.5, "y": 4.25, "matrix": [9, 4]},
+                {"x": 14.5, "y": 4.75, "matrix": [9, 5]},
+                {"x": 15.75, "y": 5, "matrix": [9, 6]}
             ]
         }
     }
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json
index 8acde1a159..cb4a939a02 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/info.json
@@ -21,98 +21,98 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":0, "y":0, "matrix": [4, 0]},
-            {"x":1, "y":0, "matrix": [5, 0]},
-            {"x":2, "y":0, "matrix": [4, 1]},
-            {"x":3, "y":0, "matrix": [5, 1]},
-            {"x":4, "y":0, "matrix": [4, 2]},
-            {"x":5, "y":0, "matrix": [5, 2]},
-            {"x":6.5, "y":0, "matrix": [4, 3]},
-            {"x":7.5, "y":0, "matrix": [5, 3]},
-            {"x":8.5, "y":0, "matrix": [4, 4]},
-            {"x":9.5, "y":0, "matrix": [5, 4]},
-            {"x":10.5, "y":0, "matrix": [4, 5]},
-            {"x":11.5, "y":0, "matrix": [5, 5]},
-            {"x":14, "y":0, "matrix": [4, 6]},
-            {"x":15, "y":0, "matrix": [5, 6]},
-            {"x":16, "y":0, "matrix": [4, 7]},
-            {"x":17, "y":0, "matrix": [5, 7]},
-            {"x":18, "y":0, "matrix": [4, 8]},
-            {"x":19, "y":0, "w":2, "matrix": [5, 8]},
+            {"x": 0, "y": 0, "matrix": [4, 0]},
+            {"x": 1, "y": 0, "matrix": [5, 0]},
+            {"x": 2, "y": 0, "matrix": [4, 1]},
+            {"x": 3, "y": 0, "matrix": [5, 1]},
+            {"x": 4, "y": 0, "matrix": [4, 2]},
+            {"x": 5, "y": 0, "matrix": [5, 2]},
+            {"x": 6.5, "y": 0, "matrix": [4, 3]},
+            {"x": 7.5, "y": 0, "matrix": [5, 3]},
+            {"x": 8.5, "y": 0, "matrix": [4, 4]},
+            {"x": 9.5, "y": 0, "matrix": [5, 4]},
+            {"x": 10.5, "y": 0, "matrix": [4, 5]},
+            {"x": 11.5, "y": 0, "matrix": [5, 5]},
+            {"x": 14, "y": 0, "matrix": [4, 6]},
+            {"x": 15, "y": 0, "matrix": [5, 6]},
+            {"x": 16, "y": 0, "matrix": [4, 7]},
+            {"x": 17, "y": 0, "matrix": [5, 7]},
+            {"x": 18, "y": 0, "matrix": [4, 8]},
+            {"x": 19, "y": 0, "w": 2, "matrix": [5, 8]},
 
-            {"x":0, "y":1, "matrix": [3, 0]},
-            {"x":1, "y":1, "matrix": [6, 0]},
-            {"x":2, "y":1, "matrix": [3, 1]},
-            {"x":3, "y":1, "matrix": [6, 1]},
-            {"x":4, "y":1, "matrix": [3, 2]},
-            {"x":5, "y":1, "matrix": [6, 2]},
-            {"x":6.5, "y":1, "matrix": [3, 3]},
-            {"x":7.5, "y":1, "matrix": [6, 3]},
-            {"x":8.5, "y":1, "matrix": [3, 4]},
-            {"x":9.5, "y":1, "matrix": [6, 4]},
-            {"x":10.5, "y":1, "matrix": [3, 5]},
-            {"x":11.5, "y":1, "matrix": [6, 5]},
-            {"x":14, "y":1, "matrix": [3, 6]},
-            {"x":15, "y":1, "matrix": [6, 6]},
-            {"x":16, "y":1, "matrix": [3, 7]},
-            {"x":17, "y":1, "matrix": [6, 7]},
-            {"x":18, "y":1, "matrix": [3, 8]},
-            {"x":19, "y":1, "matrix": [6, 8]},
-            {"x":20, "y":1, "matrix": [3, 9]},
+            {"x": 0, "y": 1, "matrix": [3, 0]},
+            {"x": 1, "y": 1, "matrix": [6, 0]},
+            {"x": 2, "y": 1, "matrix": [3, 1]},
+            {"x": 3, "y": 1, "matrix": [6, 1]},
+            {"x": 4, "y": 1, "matrix": [3, 2]},
+            {"x": 5, "y": 1, "matrix": [6, 2]},
+            {"x": 6.5, "y": 1, "matrix": [3, 3]},
+            {"x": 7.5, "y": 1, "matrix": [6, 3]},
+            {"x": 8.5, "y": 1, "matrix": [3, 4]},
+            {"x": 9.5, "y": 1, "matrix": [6, 4]},
+            {"x": 10.5, "y": 1, "matrix": [3, 5]},
+            {"x": 11.5, "y": 1, "matrix": [6, 5]},
+            {"x": 14, "y": 1, "matrix": [3, 6]},
+            {"x": 15, "y": 1, "matrix": [6, 6]},
+            {"x": 16, "y": 1, "matrix": [3, 7]},
+            {"x": 17, "y": 1, "matrix": [6, 7]},
+            {"x": 18, "y": 1, "matrix": [3, 8]},
+            {"x": 19, "y": 1, "matrix": [6, 8]},
+            {"x": 20, "y": 1, "matrix": [3, 9]},
 
-            {"x":0, "y":2, "matrix": [2, 0]},
-            {"x":1, "y":2, "matrix": [7, 0]},
-            {"x":2, "y":2, "matrix": [2, 1]},
-            {"x":3, "y":2, "matrix": [7, 1]},
-            {"x":4, "y":2, "matrix": [2, 2]},
-            {"x":5, "y":2, "matrix": [7, 2]},
-            {"x":6.5, "y":2, "w":1.25, "matrix": [2, 3]},
-            {"x":7.75, "y":2, "matrix": [7, 3]},
-            {"x":8.75, "y":2, "matrix": [2, 4]},
-            {"x":9.75, "y":2, "matrix": [7, 4]},
-            {"x":10.75, "y":2, "matrix": [2, 5]},
-            {"x":11.75, "y":2, "matrix": [7, 5]},
-            {"x":14.25, "y":2, "matrix": [2, 6]},
-            {"x":15.25, "y":2, "matrix": [7, 6]},
-            {"x":16.25, "y":2, "matrix": [2, 7]},
-            {"x":17.25, "y":2, "matrix": [7, 7]},
-            {"x":18.25, "y":2, "matrix": [2, 8]},
-            {"x":19.25, "y":2, "w":1.75, "matrix": [2, 9]},
+            {"x": 0, "y": 2, "matrix": [2, 0]},
+            {"x": 1, "y": 2, "matrix": [7, 0]},
+            {"x": 2, "y": 2, "matrix": [2, 1]},
+            {"x": 3, "y": 2, "matrix": [7, 1]},
+            {"x": 4, "y": 2, "matrix": [2, 2]},
+            {"x": 5, "y": 2, "matrix": [7, 2]},
+            {"x": 6.5, "y": 2, "w": 1.25, "matrix": [2, 3]},
+            {"x": 7.75, "y": 2, "matrix": [7, 3]},
+            {"x": 8.75, "y": 2, "matrix": [2, 4]},
+            {"x": 9.75, "y": 2, "matrix": [7, 4]},
+            {"x": 10.75, "y": 2, "matrix": [2, 5]},
+            {"x": 11.75, "y": 2, "matrix": [7, 5]},
+            {"x": 14.25, "y": 2, "matrix": [2, 6]},
+            {"x": 15.25, "y": 2, "matrix": [7, 6]},
+            {"x": 16.25, "y": 2, "matrix": [2, 7]},
+            {"x": 17.25, "y": 2, "matrix": [7, 7]},
+            {"x": 18.25, "y": 2, "matrix": [2, 8]},
+            {"x": 19.25, "y": 2, "w": 1.75, "matrix": [2, 9]},
 
-            {"x":0, "y":3, "matrix": [1, 0]},
-            {"x":1, "y":3, "matrix": [8, 0]},
-            {"x":2, "y":3, "matrix": [1, 1]},
-            {"x":3, "y":3, "matrix": [8, 1]},
-            {"x":4, "y":3, "matrix": [1, 2]},
-            {"x":5, "y":3, "matrix": [8, 2]},
-            {"x":6.5, "y":3, "w":1.75, "matrix": [1, 3]},
-            {"x":8.25, "y":3, "matrix": [8, 3]},
-            {"x":9.25, "y":3, "matrix": [1, 4]},
-            {"x":10.25, "y":3, "matrix": [8, 4]},
-            {"x":11.25, "y":3, "matrix": [1, 5]},
-            {"x":12.25, "y":3, "matrix": [8, 5]},
-            {"x":13.75, "y":3, "matrix": [1, 6]},
-            {"x":14.75, "y":3, "matrix": [8, 6]},
-            {"x":15.75, "y":3, "matrix": [1, 7]},
-            {"x":16.75, "y":3, "matrix": [8, 7]},
-            {"x":17.75, "y":3, "matrix": [1, 8]},
-            {"x":18.75, "y":3, "matrix": [8, 8]},
-            {"x":19.75, "y":3, "w":1.25, "matrix": [1, 9]},
+            {"x": 0, "y": 3, "matrix": [1, 0]},
+            {"x": 1, "y": 3, "matrix": [8, 0]},
+            {"x": 2, "y": 3, "matrix": [1, 1]},
+            {"x": 3, "y": 3, "matrix": [8, 1]},
+            {"x": 4, "y": 3, "matrix": [1, 2]},
+            {"x": 5, "y": 3, "matrix": [8, 2]},
+            {"x": 6.5, "y": 3, "w": 1.75, "matrix": [1, 3]},
+            {"x": 8.25, "y": 3, "matrix": [8, 3]},
+            {"x": 9.25, "y": 3, "matrix": [1, 4]},
+            {"x": 10.25, "y": 3, "matrix": [8, 4]},
+            {"x": 11.25, "y": 3, "matrix": [1, 5]},
+            {"x": 12.25, "y": 3, "matrix": [8, 5]},
+            {"x": 13.75, "y": 3, "matrix": [1, 6]},
+            {"x": 14.75, "y": 3, "matrix": [8, 6]},
+            {"x": 15.75, "y": 3, "matrix": [1, 7]},
+            {"x": 16.75, "y": 3, "matrix": [8, 7]},
+            {"x": 17.75, "y": 3, "matrix": [1, 8]},
+            {"x": 18.75, "y": 3, "matrix": [8, 8]},
+            {"x": 19.75, "y": 3, "w": 1.25, "matrix": [1, 9]},
 
-            {"x":0, "y":4, "matrix": [0, 0]},
-            {"x":1, "y":4, "matrix": [9, 0]},
-            {"x":2, "y":4, "matrix": [0, 1]},
-            {"x":3, "y":4, "matrix": [9, 1]},
-            {"x":4, "y":4, "matrix": [0, 2]},
-            {"x":5, "y":4, "matrix": [9, 2]},
-            {"x":6.5, "y":4, "w":1.25, "matrix": [0, 3]},
-            {"x":7.75, "y":4, "w":1.25, "matrix": [9, 3]},
-            {"x":10.25, "y":4, "w":1.25, "matrix": [0, 4]},
-            {"x":11.5, "y":4, "w":1.75, "matrix": [9, 5]},
-            {"x":13.75, "y":4, "w":1.75, "matrix": [0, 6]},
-            {"x":15.5, "y":4, "w":1.25, "matrix": [9, 7]},
-            {"x":18.5, "y":4, "w":1.25, "matrix": [9, 8]},
-            {"x":19.75, "y":4, "w":1.25, "matrix": [0, 9]}
+            {"x": 0, "y": 4, "matrix": [0, 0]},
+            {"x": 1, "y": 4, "matrix": [9, 0]},
+            {"x": 2, "y": 4, "matrix": [0, 1]},
+            {"x": 3, "y": 4, "matrix": [9, 1]},
+            {"x": 4, "y": 4, "matrix": [0, 2]},
+            {"x": 5, "y": 4, "matrix": [9, 2]},
+            {"x": 6.5, "y": 4, "w": 1.25, "matrix": [0, 3]},
+            {"x": 7.75, "y": 4, "w": 1.25, "matrix": [9, 3]},
+            {"x": 10.25, "y": 4, "w": 1.25, "matrix": [0, 4]},
+            {"x": 11.5, "y": 4, "w": 1.75, "matrix": [9, 5]},
+            {"x": 13.75, "y": 4, "w": 1.75, "matrix": [0, 6]},
+            {"x": 15.5, "y": 4, "w": 1.25, "matrix": [9, 7]},
+            {"x": 18.5, "y": 4, "w": 1.25, "matrix": [9, 8]},
+            {"x": 19.75, "y": 4, "w": 1.25, "matrix": [0, 9]}
           ]
       }
   }
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/info.json
index 793ebbd32f..dfc1198c58 100644
--- a/keyboards/handwired/split89/info.json
+++ b/keyboards/handwired/split89/info.json
@@ -27,95 +27,95 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                    {"label":"Esc", "matrix": [0, 4], "x":0, "y":0},
-                    {"label":"F1", "matrix": [0, 5], "x":2, "y":0},
-                    {"label":"F2", "matrix": [0, 6], "x":3, "y":0},
-                    {"label":"F3", "matrix": [0, 7], "x":4, "y":0},
-                    {"label":"F4", "matrix": [0, 8], "x":5, "y":0},
-                    {"label":"F5", "matrix": [0, 9], "x":6, "y":0},
-                    {"label":"F6", "matrix": [6, 0], "x":10.25, "y":0},
-                    {"label":"F7", "matrix": [6, 1], "x":11.25, "y":0},
-                    {"label":"F8", "matrix": [6, 2], "x":12.25, "y":0},
-                    {"label":"F9", "matrix": [6, 3], "x":13.75, "y":0},
-                    {"label":"F10", "matrix": [6, 4], "x":14.75, "y":0},
-                    {"label":"F11", "matrix": [6, 5], "x":15.75, "y":0},
-                    {"label":"F12", "matrix": [6, 6], "x":16.75, "y":0},
-                    {"label":"PrtSc", "matrix": [6, 7], "x":18, "y":0},
-                    {"label":"Scroll Lock", "matrix": [6, 8], "x":19, "y":0},
-                    {"label":"Pause", "matrix": [6, 9], "x":20, "y":0},
-                    {"label":"~", "matrix": [2, 4], "x":0, "y":1.5},
-                    {"label":"1!", "matrix": [1, 4], "x":1, "y":1.5},
-                    {"label":"2@", "matrix": [1, 5], "x":2, "y":1.5},
-                    {"label":"3#", "matrix": [1, 6], "x":3, "y":1.5},
-                    {"label":"4$", "matrix": [1, 7], "x":4, "y":1.5},
-                    {"label":"5%", "matrix": [1, 8], "x":5, "y":1.5},
-                    {"label":"6^", "matrix": [1, 9], "x":6, "y":1.5},
-                    {"label":"7&", "matrix": [7, 0], "x":9.75, "y":1.5},
-                    {"label":"8*", "matrix": [7, 1], "x":10.75, "y":1.5},
-                    {"label":"9(", "matrix": [7, 2], "x":11.75, "y":1.5},
-                    {"label":"0)", "matrix": [7, 3], "x":12.75, "y":1.5},
-                    {"label":"-_", "matrix": [7, 4], "x":13.75, "y":1.5},
-                    {"label":"=+", "matrix": [7, 5], "x":14.75, "y":1.5},
-                    {"label":"Backspace", "matrix": [7, 6], "x":15.75, "y":1.5, "w":2},
-                    {"label":"Insert", "matrix": [7, 7], "x":18, "y":1.5},
-                    {"label":"Home", "matrix": [7, 8], "x":19, "y":1.5},
-                    {"label":"PgUp", "matrix": [7, 9], "x":20, "y":1.5},
-                    {"label":"Tab", "matrix": [3, 4], "x":0, "y":2.5, "w":1.5},
-                    {"label":"Q", "matrix": [2, 5], "x":1.5, "y":2.5},
-                    {"label":"W", "matrix": [2, 6], "x":2.5, "y":2.5},
-                    {"label":"E", "matrix": [2, 7], "x":3.5, "y":2.5},
-                    {"label":"R", "matrix": [2, 8], "x":4.5, "y":2.5},
-                    {"label":"T", "matrix": [2, 9], "x":5.5, "y":2.5},
-                    {"label":"Y", "matrix": [9, 0], "x":9.25, "y":2.5},
-                    {"label":"U", "matrix": [8, 0], "x":10.25, "y":2.5},
-                    {"label":"I", "matrix": [8, 1], "x":11.25, "y":2.5},
-                    {"label":"O", "matrix": [8, 2], "x":12.25, "y":2.5},
-                    {"label":"P", "matrix": [8, 3], "x":13.25, "y":2.5},
-                    {"label":"{", "matrix": [8, 4], "x":14.25, "y":2.5},
-                    {"label":"}", "matrix": [8, 5], "x":15.25, "y":2.5},
-                    {"label":"|", "matrix": [8, 6], "x":16.25, "y":2.5, "w":1.5},
-                    {"label":"Delete", "matrix": [8, 7], "x":18, "y":2.5},
-                    {"label":"End", "matrix": [8, 8], "x":19, "y":2.5},
-                    {"label":"PgDn", "matrix": [8, 9], "x":20, "y":2.5},
-                    {"label":"Caps Lock", "matrix": [4, 4], "x":0, "y":3.5, "w":1.75},
-                    {"label":"A", "matrix": [3, 5], "x":1.75, "y":3.5},
-                    {"label":"S", "matrix": [3, 6], "x":2.75, "y":3.5},
-                    {"label":"D", "matrix": [3, 7], "x":3.75, "y":3.5},
-                    {"label":"F", "matrix": [3, 8], "x":4.75, "y":3.5},
-                    {"label":"G", "matrix": [3, 9], "x":5.75, "y":3.5},
-                    {"label":"H", "matrix": [10, 0], "x":9.5, "y":3.5},
-                    {"label":"J", "matrix": [9, 1], "x":10.5, "y":3.5},
-                    {"label":"K", "matrix": [9, 2], "x":11.5, "y":3.5},
-                    {"label":"L", "matrix": [9, 3], "x":12.5, "y":3.5},
-                    {"label":":", "matrix": [9, 4], "x":13.5, "y":3.5},
-                    {"label":"\"", "matrix": [9, 5], "x":14.5, "y":3.5},
-                    {"label":"Enter", "matrix": [9, 6], "x":15.5, "y":3.5, "w":2.25},
-                    {"label":"Shift", "matrix": [5, 4], "x":0, "y":4.5, "w":2.25},
-                    {"label":"Z", "matrix": [4, 5], "x":2.25, "y":4.5},
-                    {"label":"X", "matrix": [4, 6], "x":3.25, "y":4.5},
-                    {"label":"C", "matrix": [4, 7], "x":4.25, "y":4.5},
-                    {"label":"V", "matrix": [4, 8], "x":5.25, "y":4.5},
-                    {"label":"B", "matrix": [4, 9], "x":6.25, "y":4.5},
-                    {"label":"N", "matrix": [11, 0], "x":10, "y":4.5},
-                    {"label":"M", "matrix": [10, 1], "x":11, "y":4.5},
-                    {"label":"<", "matrix": [10, 2], "x":12, "y":4.5},
-                    {"label":">", "matrix": [10, 3], "x":13, "y":4.5},
-                    {"label":"?", "matrix": [10, 4], "x":14, "y":4.5},
-                    {"label":"Shift", "matrix": [10, 6], "x":15, "y":4.5, "w":2.75},
-                    {"label":"\u2191", "matrix": [10, 8], "x":19, "y":4.5},
-                    {"label":"Ctrl", "matrix": [5, 5], "x":0, "y":5.5, "w":1.25},
-                    {"label":"Fn", "matrix": [5, 6], "x":1.25, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [5, 7], "x":2.5, "y":5.5, "w":1.25},
-                    {"label":"Alt", "matrix": [5, 8], "x":3.75, "y":5.5, "w":1.25},
-                    {"label":"Space", "matrix": [5, 9], "x":5, "y":5.5, "w":2.25},
-                    {"label":"Space", "matrix": [11, 1], "x":10, "y":5.5, "w":2.75},
-                    {"label":"Alt", "matrix": [11, 3], "x":12.75, "y":5.5, "w":1.25},
-                    {"label":"Win", "matrix": [11, 4], "x":14, "y":5.5, "w":1.25},
-                    {"label":"Menu", "matrix": [11, 5], "x":15.25, "y":5.5, "w":1.25},
-                    {"label":"Ctrl", "matrix": [11, 6], "x":16.5, "y":5.5, "w":1.25},
-                    {"label":"\u2190", "matrix": [11, 7], "x":18, "y":5.5},
-                    {"label":"\u2193", "matrix": [11, 8], "x":19, "y":5.5},
-                    {"label":"\u2192", "matrix": [11, 9], "x":20, "y":5.5}
+                    {"label": "Esc", "matrix": [0, 4], "x": 0, "y": 0},
+                    {"label": "F1", "matrix": [0, 5], "x": 2, "y": 0},
+                    {"label": "F2", "matrix": [0, 6], "x": 3, "y": 0},
+                    {"label": "F3", "matrix": [0, 7], "x": 4, "y": 0},
+                    {"label": "F4", "matrix": [0, 8], "x": 5, "y": 0},
+                    {"label": "F5", "matrix": [0, 9], "x": 6, "y": 0},
+                    {"label": "F6", "matrix": [6, 0], "x": 10.25, "y": 0},
+                    {"label": "F7", "matrix": [6, 1], "x": 11.25, "y": 0},
+                    {"label": "F8", "matrix": [6, 2], "x": 12.25, "y": 0},
+                    {"label": "F9", "matrix": [6, 3], "x": 13.75, "y": 0},
+                    {"label": "F10", "matrix": [6, 4], "x": 14.75, "y": 0},
+                    {"label": "F11", "matrix": [6, 5], "x": 15.75, "y": 0},
+                    {"label": "F12", "matrix": [6, 6], "x": 16.75, "y": 0},
+                    {"label": "PrtSc", "matrix": [6, 7], "x": 18, "y": 0},
+                    {"label": "Scroll Lock", "matrix": [6, 8], "x": 19, "y": 0},
+                    {"label": "Pause", "matrix": [6, 9], "x": 20, "y": 0},
+                    {"label": "~", "matrix": [2, 4], "x": 0, "y": 1.5},
+                    {"label": "1!", "matrix": [1, 4], "x": 1, "y": 1.5},
+                    {"label": "2@", "matrix": [1, 5], "x": 2, "y": 1.5},
+                    {"label": "3#", "matrix": [1, 6], "x": 3, "y": 1.5},
+                    {"label": "4$", "matrix": [1, 7], "x": 4, "y": 1.5},
+                    {"label": "5%", "matrix": [1, 8], "x": 5, "y": 1.5},
+                    {"label": "6^", "matrix": [1, 9], "x": 6, "y": 1.5},
+                    {"label": "7&", "matrix": [7, 0], "x": 9.75, "y": 1.5},
+                    {"label": "8*", "matrix": [7, 1], "x": 10.75, "y": 1.5},
+                    {"label": "9(", "matrix": [7, 2], "x": 11.75, "y": 1.5},
+                    {"label": "0)", "matrix": [7, 3], "x": 12.75, "y": 1.5},
+                    {"label": "-_", "matrix": [7, 4], "x": 13.75, "y": 1.5},
+                    {"label": "=+", "matrix": [7, 5], "x": 14.75, "y": 1.5},
+                    {"label": "Backspace", "matrix": [7, 6], "x": 15.75, "y": 1.5, "w": 2},
+                    {"label": "Insert", "matrix": [7, 7], "x": 18, "y": 1.5},
+                    {"label": "Home", "matrix": [7, 8], "x": 19, "y": 1.5},
+                    {"label": "PgUp", "matrix": [7, 9], "x": 20, "y": 1.5},
+                    {"label": "Tab", "matrix": [3, 4], "x": 0, "y": 2.5, "w": 1.5},
+                    {"label": "Q", "matrix": [2, 5], "x": 1.5, "y": 2.5},
+                    {"label": "W", "matrix": [2, 6], "x": 2.5, "y": 2.5},
+                    {"label": "E", "matrix": [2, 7], "x": 3.5, "y": 2.5},
+                    {"label": "R", "matrix": [2, 8], "x": 4.5, "y": 2.5},
+                    {"label": "T", "matrix": [2, 9], "x": 5.5, "y": 2.5},
+                    {"label": "Y", "matrix": [9, 0], "x": 9.25, "y": 2.5},
+                    {"label": "U", "matrix": [8, 0], "x": 10.25, "y": 2.5},
+                    {"label": "I", "matrix": [8, 1], "x": 11.25, "y": 2.5},
+                    {"label": "O", "matrix": [8, 2], "x": 12.25, "y": 2.5},
+                    {"label": "P", "matrix": [8, 3], "x": 13.25, "y": 2.5},
+                    {"label": "{", "matrix": [8, 4], "x": 14.25, "y": 2.5},
+                    {"label": "}", "matrix": [8, 5], "x": 15.25, "y": 2.5},
+                    {"label": "|", "matrix": [8, 6], "x": 16.25, "y": 2.5, "w": 1.5},
+                    {"label": "Delete", "matrix": [8, 7], "x": 18, "y": 2.5},
+                    {"label": "End", "matrix": [8, 8], "x": 19, "y": 2.5},
+                    {"label": "PgDn", "matrix": [8, 9], "x": 20, "y": 2.5},
+                    {"label": "Caps Lock", "matrix": [4, 4], "x": 0, "y": 3.5, "w": 1.75},
+                    {"label": "A", "matrix": [3, 5], "x": 1.75, "y": 3.5},
+                    {"label": "S", "matrix": [3, 6], "x": 2.75, "y": 3.5},
+                    {"label": "D", "matrix": [3, 7], "x": 3.75, "y": 3.5},
+                    {"label": "F", "matrix": [3, 8], "x": 4.75, "y": 3.5},
+                    {"label": "G", "matrix": [3, 9], "x": 5.75, "y": 3.5},
+                    {"label": "H", "matrix": [10, 0], "x": 9.5, "y": 3.5},
+                    {"label": "J", "matrix": [9, 1], "x": 10.5, "y": 3.5},
+                    {"label": "K", "matrix": [9, 2], "x": 11.5, "y": 3.5},
+                    {"label": "L", "matrix": [9, 3], "x": 12.5, "y": 3.5},
+                    {"label": ":", "matrix": [9, 4], "x": 13.5, "y": 3.5},
+                    {"label": "\"", "matrix": [9, 5], "x": 14.5, "y": 3.5},
+                    {"label": "Enter", "matrix": [9, 6], "x": 15.5, "y": 3.5, "w": 2.25},
+                    {"label": "Shift", "matrix": [5, 4], "x": 0, "y": 4.5, "w": 2.25},
+                    {"label": "Z", "matrix": [4, 5], "x": 2.25, "y": 4.5},
+                    {"label": "X", "matrix": [4, 6], "x": 3.25, "y": 4.5},
+                    {"label": "C", "matrix": [4, 7], "x": 4.25, "y": 4.5},
+                    {"label": "V", "matrix": [4, 8], "x": 5.25, "y": 4.5},
+                    {"label": "B", "matrix": [4, 9], "x": 6.25, "y": 4.5},
+                    {"label": "N", "matrix": [11, 0], "x": 10, "y": 4.5},
+                    {"label": "M", "matrix": [10, 1], "x": 11, "y": 4.5},
+                    {"label": "<", "matrix": [10, 2], "x": 12, "y": 4.5},
+                    {"label": ">", "matrix": [10, 3], "x": 13, "y": 4.5},
+                    {"label": "?", "matrix": [10, 4], "x": 14, "y": 4.5},
+                    {"label": "Shift", "matrix": [10, 6], "x": 15, "y": 4.5, "w": 2.75},
+                    {"label": "\u2191", "matrix": [10, 8], "x": 19, "y": 4.5},
+                    {"label": "Ctrl", "matrix": [5, 5], "x": 0, "y": 5.5, "w": 1.25},
+                    {"label": "Fn", "matrix": [5, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [5, 7], "x": 2.5, "y": 5.5, "w": 1.25},
+                    {"label": "Alt", "matrix": [5, 8], "x": 3.75, "y": 5.5, "w": 1.25},
+                    {"label": "Space", "matrix": [5, 9], "x": 5, "y": 5.5, "w": 2.25},
+                    {"label": "Space", "matrix": [11, 1], "x": 10, "y": 5.5, "w": 2.75},
+                    {"label": "Alt", "matrix": [11, 3], "x": 12.75, "y": 5.5, "w": 1.25},
+                    {"label": "Win", "matrix": [11, 4], "x": 14, "y": 5.5, "w": 1.25},
+                    {"label": "Menu", "matrix": [11, 5], "x": 15.25, "y": 5.5, "w": 1.25},
+                    {"label": "Ctrl", "matrix": [11, 6], "x": 16.5, "y": 5.5, "w": 1.25},
+                    {"label": "\u2190", "matrix": [11, 7], "x": 18, "y": 5.5},
+                    {"label": "\u2193", "matrix": [11, 8], "x": 19, "y": 5.5},
+                    {"label": "\u2192", "matrix": [11, 9], "x": 20, "y": 5.5}
                     ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/info.json
index 937d462918..074a5f8954 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/info.json
@@ -20,12 +20,12 @@
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/info.json
index 1e67a91d48..8bd5ca4fcc 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/info.json
@@ -19,14 +19,14 @@
     "layouts": {
         "LAYOUT_ortho_2x4": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
             ]
         }
     }
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/info.json
index 4bfe269ee6..be24426de0 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/info.json
@@ -19,16 +19,16 @@
     "layouts": {
         "LAYOUT_ortho_2x5": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]}
             ]
         }
     }
diff --git a/keyboards/hineybush/ibis/info.json b/keyboards/hineybush/ibis/info.json
index 7e844f1bf1..8c2f6ca3fe 100644
--- a/keyboards/hineybush/ibis/info.json
+++ b/keyboards/hineybush/ibis/info.json
@@ -13,30 +13,8 @@
         "nkro": true
     },
     "matrix_pins": {
-        "cols": [
-            "F0",
-            "F1",
-            "F4",
-            "F5",
-            "F6",
-            "F7",
-            "B6",
-            "B5",
-            "D6",
-            "D4"
-        ],
-        "rows": [
-            "B0",
-            "B1",
-            "B2",
-            "B3",
-            "C7",
-            "C6",
-            "B4",
-            "D7",
-            "D5",
-            "D3"
-        ]
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D6", "D4"],
+        "rows": ["B0", "B1", "B2", "B3", "C7", "C6", "B4", "D7", "D5", "D3"]
     },
     "processor": "atmega32u4",
     "url": "",
@@ -52,290 +30,290 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0},
-                {"matrix": [1, 0], "x":1, "y":0},
-                {"matrix": [0, 1], "x":2, "y":0},
-                {"matrix": [1, 1], "x":3, "y":0},
-                {"matrix": [0, 2], "x":4, "y":0},
-                {"matrix": [1, 2], "x":5, "y":0},
-                {"matrix": [0, 3], "x":6, "y":0},
-                {"matrix": [1, 3], "x":7, "y":0},
-                {"matrix": [0, 4], "x":8, "y":0},
-                {"matrix": [1, 4], "x":9, "y":0},
-                {"matrix": [0, 5], "x":10, "y":0},
-                {"matrix": [1, 5], "x":11, "y":0},
-                {"matrix": [0, 6], "x":12, "y":0},
-                {"matrix": [1, 6], "x":13, "y":0},
-                {"matrix": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [4, 6], "x":12.75, "y":2},
-                {"matrix": [5, 6], "x":13.75, "y":2, "w":1.25},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
-                {"matrix": [7, 0], "x":1.25, "y":3},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_ansi_all": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0},
-                {"matrix": [1, 0], "x":1, "y":0},
-                {"matrix": [0, 1], "x":2, "y":0},
-                {"matrix": [1, 1], "x":3, "y":0},
-                {"matrix": [0, 2], "x":4, "y":0},
-                {"matrix": [1, 2], "x":5, "y":0},
-                {"matrix": [0, 3], "x":6, "y":0},
-                {"matrix": [1, 3], "x":7, "y":0},
-                {"matrix": [0, 4], "x":8, "y":0},
-                {"matrix": [1, 4], "x":9, "y":0},
-                {"matrix": [0, 5], "x":10, "y":0},
-                {"matrix": [1, 5], "x":11, "y":0},
-                {"matrix": [0, 6], "x":12, "y":0},
-                {"matrix": [1, 6], "x":13, "y":0},
-                {"matrix": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [5, 6], "x":12.75, "y":2, "w":2.25},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":2.25},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         },
         "LAYOUT_iso_all": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0},
-                {"matrix": [1, 0], "x":1, "y":0},
-                {"matrix": [0, 1], "x":2, "y":0},
-                {"matrix": [1, 1], "x":3, "y":0},
-                {"matrix": [0, 2], "x":4, "y":0},
-                {"matrix": [1, 2], "x":5, "y":0},
-                {"matrix": [0, 3], "x":6, "y":0},
-                {"matrix": [1, 3], "x":7, "y":0},
-                {"matrix": [0, 4], "x":8, "y":0},
-                {"matrix": [1, 4], "x":9, "y":0},
-                {"matrix": [0, 5], "x":10, "y":0},
-                {"matrix": [1, 5], "x":11, "y":0},
-                {"matrix": [0, 6], "x":12, "y":0},
-                {"matrix": [1, 6], "x":13, "y":0},
-                {"matrix": [1, 7], "x":14, "y":0},
-                {"matrix": [3, 7], "x":15.25, "y":0},
-                {"matrix": [0, 8], "x":16.5, "y":0},
-                {"matrix": [1, 8], "x":17.5, "y":0},
-                {"matrix": [0, 9], "x":18.5, "y":0},
-                {"matrix": [1, 9], "x":19.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [1, 7], "x": 14, "y": 0},
+                {"matrix": [3, 7], "x": 15.25, "y": 0},
+                {"matrix": [0, 8], "x": 16.5, "y": 0},
+                {"matrix": [1, 8], "x": 17.5, "y": 0},
+                {"matrix": [0, 9], "x": 18.5, "y": 0},
+                {"matrix": [1, 9], "x": 19.5, "y": 0},
 
-                {"matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [3, 0], "x":1.5, "y":1},
-                {"matrix": [2, 1], "x":2.5, "y":1},
-                {"matrix": [3, 1], "x":3.5, "y":1},
-                {"matrix": [2, 2], "x":4.5, "y":1},
-                {"matrix": [3, 2], "x":5.5, "y":1},
-                {"matrix": [2, 3], "x":6.5, "y":1},
-                {"matrix": [3, 3], "x":7.5, "y":1},
-                {"matrix": [2, 4], "x":8.5, "y":1},
-                {"matrix": [3, 4], "x":9.5, "y":1},
-                {"matrix": [2, 5], "x":10.5, "y":1},
-                {"matrix": [3, 5], "x":11.5, "y":1},
-                {"matrix": [2, 6], "x":12.5, "y":1},
-                {"matrix": [5, 7], "x":15.25, "y":1},
-                {"matrix": [2, 8], "x":16.5, "y":1},
-                {"matrix": [3, 8], "x":17.5, "y":1},
-                {"matrix": [2, 9], "x":18.5, "y":1},
-                {"matrix": [3, 9], "x":19.5, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [5, 7], "x": 15.25, "y": 1},
+                {"matrix": [2, 8], "x": 16.5, "y": 1},
+                {"matrix": [3, 8], "x": 17.5, "y": 1},
+                {"matrix": [2, 9], "x": 18.5, "y": 1},
+                {"matrix": [3, 9], "x": 19.5, "y": 1},
 
-                {"matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [5, 0], "x":1.75, "y":2},
-                {"matrix": [4, 1], "x":2.75, "y":2},
-                {"matrix": [5, 1], "x":3.75, "y":2},
-                {"matrix": [4, 2], "x":4.75, "y":2},
-                {"matrix": [5, 2], "x":5.75, "y":2},
-                {"matrix": [4, 3], "x":6.75, "y":2},
-                {"matrix": [5, 3], "x":7.75, "y":2},
-                {"matrix": [4, 4], "x":8.75, "y":2},
-                {"matrix": [5, 4], "x":9.75, "y":2},
-                {"matrix": [4, 5], "x":10.75, "y":2},
-                {"matrix": [5, 5], "x":11.75, "y":2},
-                {"matrix": [4, 6], "x":12.75, "y":2},
-                {"matrix": [5, 6], "x":13.75, "y":1, "w":1.25, "h":2},
-                {"matrix": [4, 8], "x":16.5, "y":2},
-                {"matrix": [5, 8], "x":17.5, "y":2},
-                {"matrix": [4, 9], "x":18.5, "y":2},
-                {"matrix": [5, 9], "x":19.5, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 8], "x": 16.5, "y": 2},
+                {"matrix": [5, 8], "x": 17.5, "y": 2},
+                {"matrix": [4, 9], "x": 18.5, "y": 2},
+                {"matrix": [5, 9], "x": 19.5, "y": 2},
 
-                {"matrix": [6, 0], "x":0, "y":3, "w":1.25},
-                {"matrix": [7, 0], "x":1.25, "y":3},
-                {"matrix": [6, 1], "x":2.25, "y":3},
-                {"matrix": [7, 1], "x":3.25, "y":3},
-                {"matrix": [6, 2], "x":4.25, "y":3},
-                {"matrix": [7, 2], "x":5.25, "y":3},
-                {"matrix": [6, 3], "x":6.25, "y":3},
-                {"matrix": [7, 3], "x":7.25, "y":3},
-                {"matrix": [6, 4], "x":8.25, "y":3},
-                {"matrix": [7, 4], "x":9.25, "y":3},
-                {"matrix": [6, 5], "x":10.25, "y":3},
-                {"matrix": [7, 5], "x":11.25, "y":3},
-                {"matrix": [6, 6], "x":12.25, "y":3, "w":1.75},
-                {"matrix": [7, 6], "x":14, "y":3},
-                {"matrix": [7, 7], "x":15.25, "y":3.25},
-                {"matrix": [6, 8], "x":16.5, "y":3},
-                {"matrix": [7, 8], "x":17.5, "y":3},
-                {"matrix": [6, 9], "x":18.5, "y":3},
-                {"matrix": [7, 9], "x":19.5, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [7, 0], "x": 1.25, "y": 3},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [7, 6], "x": 14, "y": 3},
+                {"matrix": [7, 7], "x": 15.25, "y": 3.25},
+                {"matrix": [6, 8], "x": 16.5, "y": 3},
+                {"matrix": [7, 8], "x": 17.5, "y": 3},
+                {"matrix": [6, 9], "x": 18.5, "y": 3},
+                {"matrix": [7, 9], "x": 19.5, "y": 3},
 
-                {"matrix": [8, 0], "x":0, "y":4, "w":1.5},
-                {"matrix": [9, 0], "x":1.5, "y":4},
-                {"matrix": [8, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix": [8, 3], "x":4, "y":4, "w":6.25},
-                {"matrix": [8, 5], "x":10.25, "y":4, "w":1.25},
-                {"matrix": [9, 5], "x":11.5, "y":4, "w":1.25},
-                {"matrix": [8, 6], "x":12.75, "y":4, "w":1.25},
-                {"matrix": [9, 6], "x":14.25, "y":4.25},
-                {"matrix": [9, 7], "x":15.25, "y":4.25},
-                {"matrix": [8, 8], "x":16.25, "y":4.25},
-                {"matrix": [9, 8], "x":17.5, "y":4},
-                {"matrix": [8, 9], "x":18.5, "y":4},
-                {"matrix": [9, 9], "x":19.5, "y":4}
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 1.5, "y": 4},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [8, 3], "x": 4, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25},
+                {"matrix": [9, 7], "x": 15.25, "y": 4.25},
+                {"matrix": [8, 8], "x": 16.25, "y": 4.25},
+                {"matrix": [9, 8], "x": 17.5, "y": 4},
+                {"matrix": [8, 9], "x": 18.5, "y": 4},
+                {"matrix": [9, 9], "x": 19.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/ibm/model_m_4th_gen/info.json b/keyboards/ibm/model_m_4th_gen/info.json
index 5c8c658607..d31914f90b 100644
--- a/keyboards/ibm/model_m_4th_gen/info.json
+++ b/keyboards/ibm/model_m_4th_gen/info.json
@@ -10,2551 +10,326 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        15
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 6
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [4, 6], "x": 13, "y": 1.5},
+                {"matrix": [1, 6], "x": 14, "y": 1.5},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 11], "x": 21.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 15], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [7, 3], "x": 12.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 15], "x": 4, "y": 5.5},
+                {"matrix": [7, 6], "x": 5, "y": 5.5, "w": 6},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 8], "x": 18.5, "y": 5.5},
+                {"matrix": [0, 9], "x": 19.5, "y": 5.5},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 9], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        15
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [2, 15], "x": 2, "y": 0},
+                {"matrix": [2, 14], "x": 3, "y": 0},
+                {"matrix": [1, 14], "x": 4, "y": 0},
+                {"matrix": [0, 14], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [2, 4], "x": 9.5, "y": 0},
+                {"matrix": [2, 6], "x": 11, "y": 0},
+                {"matrix": [3, 6], "x": 12, "y": 0},
+                {"matrix": [3, 8], "x": 13, "y": 0},
+                {"matrix": [3, 9], "x": 14, "y": 0},
+                {"matrix": [3, 12], "x": 15.25, "y": 0},
+                {"matrix": [4, 12], "x": 16.25, "y": 0},
+                {"matrix": [6, 11], "x": 17.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1.5},
+                {"matrix": [3, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 15], "x": 2, "y": 1.5},
+                {"matrix": [3, 14], "x": 3, "y": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1.5},
+                {"matrix": [2, 1], "x": 5, "y": 1.5},
+                {"matrix": [2, 2], "x": 6, "y": 1.5},
+                {"matrix": [3, 2], "x": 7, "y": 1.5},
+                {"matrix": [3, 3], "x": 8, "y": 1.5},
+                {"matrix": [3, 4], "x": 9, "y": 1.5},
+                {"matrix": [3, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 5], "x": 11, "y": 1.5},
+                {"matrix": [2, 3], "x": 12, "y": 1.5},
+                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.5},
+                {"matrix": [2, 11], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 10], "x": 17.25, "y": 1.5},
+                {"matrix": [6, 8], "x": 18.5, "y": 1.5},
+                {"matrix": [6, 9], "x": 19.5, "y": 1.5},
+                {"matrix": [6, 10], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 10], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [4, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 15], "x": 2.5, "y": 2.5},
+                {"matrix": [4, 14], "x": 3.5, "y": 2.5},
+                {"matrix": [4, 1], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 1], "x": 5.5, "y": 2.5},
+                {"matrix": [1, 2], "x": 6.5, "y": 2.5},
+                {"matrix": [4, 2], "x": 7.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [4, 4], "x": 9.5, "y": 2.5},
+                {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [1, 3], "x": 12.5, "y": 2.5},
+                {"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.5},
+                {"matrix": [3, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [3, 10], "x": 17.25, "y": 2.5},
+                {"matrix": [4, 8], "x": 18.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 19.5, "y": 2.5},
+                {"matrix": [4, 10], "x": 20.5, "y": 2.5},
+                {"matrix": [4, 11], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [5, 15], "x": 2.75, "y": 3.5},
+                {"matrix": [5, 14], "x": 3.75, "y": 3.5},
+                {"matrix": [5, 1], "x": 4.75, "y": 3.5},
+                {"matrix": [0, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [0, 2], "x": 6.75, "y": 3.5},
+                {"matrix": [5, 2], "x": 7.75, "y": 3.5},
+                {"matrix": [5, 3], "x": 8.75, "y": 3.5},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [0, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.5},
+                {"matrix": [1, 8], "x": 18.5, "y": 3.5},
+                {"matrix": [1, 9], "x": 19.5, "y": 3.5},
+                {"matrix": [1, 10], "x": 20.5, "y": 3.5},
+                {"matrix": [1, 7], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [0, 15], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [6, 15], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 1], "x": 5.25, "y": 4.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4.5},
+                {"matrix": [7, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.25, "y": 4.5},
+                {"matrix": [6, 3], "x": 9.25, "y": 4.5},
+                {"matrix": [6, 4], "x": 10.25, "y": 4.5},
+                {"matrix": [7, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [0, 11], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 8], "x": 18.5, "y": 4.5},
+                {"matrix": [5, 9], "x": 19.5, "y": 4.5},
+                {"matrix": [5, 10], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 11], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [2, 13], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [0, 12], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [7, 12], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 13], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 11], "x": 15.25, "y": 5.5},
+                {"matrix": [7, 8], "x": 16.25, "y": 5.5},
+                {"matrix": [7, 9], "x": 17.25, "y": 5.5},
+                {"matrix": [0, 9], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [0, 10], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json
index 9fa2719e8c..57f9e520a3 100644
--- a/keyboards/idobao/id61/info.json
+++ b/keyboards/idobao/id61/info.json
@@ -35,71 +35,71 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                { "label": "Esc", "matrix": [0, 0], "x":0, "y":0 },
-                { "label": "1!", "matrix": [0, 1], "x":1, "y":0 },
-                { "label": "2@", "matrix": [0, 2], "x":2, "y":0 },
-                { "label": "3#", "matrix": [0, 3], "x":3, "y":0 },
-                { "label": "4$", "matrix": [0, 4], "x":4, "y":0 },
-                { "label": "5%", "matrix": [0, 5], "x":5, "y":0 },
-                { "label": "6^", "matrix": [0, 6], "x":6, "y":0 },
-                { "label": "7&", "matrix": [0, 7], "x":7, "y":0 },
-                { "label": "8*", "matrix": [0, 8], "x":8, "y":0 },
-                { "label": "9(", "matrix": [0, 9], "x":9, "y":0 },
-                { "label": "0)", "matrix": [0, 10], "x":10, "y":0 },
-                { "label": "-_", "matrix": [0, 11], "x":11, "y":0 },
-                { "label": "=+", "matrix": [0, 12], "x":12, "y":0 },
-                { "label": "Backspace", "matrix": [0, 13], "x":13, "y":0, "w":2 },
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                { "label": "Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "label": "Q", "matrix": [1, 1], "x":1.5, "y":1 },
-                { "label": "W", "matrix": [1, 2], "x":2.5, "y":1 },
-                { "label": "E", "matrix": [1, 3], "x":3.5, "y":1 },
-                { "label": "R", "matrix": [1, 4], "x":4.5, "y":1 },
-                { "label": "T", "matrix": [1, 5], "x":5.5, "y":1 },
-                { "label": "Y", "matrix": [1, 6], "x":6.5, "y":1 },
-                { "label": "U", "matrix": [1, 7], "x":7.5, "y":1 },
-                { "label": "I", "matrix": [1, 8], "x":8.5, "y":1 },
-                { "label": "O", "matrix": [1, 9], "x":9.5, "y":1 },
-                { "label": "P", "matrix": [1, 10], "x":10.5, "y":1 },
-                { "label": "[{", "matrix": [1, 11], "x":11.5, "y":1 },
-                { "label": "]}", "matrix": [1, 12], "x":12.5, "y":1 },
-                { "label": "\\|", "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+                {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1},
+                {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1},
+                {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                { "label": "Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "label": "A", "matrix": [2, 1], "x":1.75, "y":2 },
-                { "label": "S", "matrix": [2, 2], "x":2.75, "y":2 },
-                { "label": "D", "matrix": [2, 3], "x":3.75, "y":2 },
-                { "label": "F", "matrix": [2, 4], "x":4.75, "y":2 },
-                { "label": "G", "matrix": [2, 5], "x":5.75, "y":2 },
-                { "label": "H", "matrix": [2, 6], "x":6.75, "y":2 },
-                { "label": "J", "matrix": [2, 7], "x":7.75, "y":2 },
-                { "label": "K", "matrix": [2, 8], "x":8.75, "y":2 },
-                { "label": "L", "matrix": [2, 9], "x":9.75, "y":2 },
-                { "label": ";:", "matrix": [2, 10], "x":10.75, "y":2 },
-                { "label": "'\"", "matrix": [2, 11], "x":11.75, "y":2 },
-                { "label": "Enter", "matrix": [2, 12], "x":12.75, "y":2, "w":2.25 },
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
 
-                { "label": "Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-                { "label": "Z", "matrix": [3, 2], "x":2.25, "y":3 },
-                { "label": "X", "matrix": [3, 3], "x":3.25, "y":3 },
-                { "label": "C", "matrix": [3, 4], "x":4.25, "y":3 },
-                { "label": "V", "matrix": [3, 5], "x":5.25, "y":3 },
-                { "label": "B", "matrix": [3, 6], "x":6.25, "y":3 },
-                { "label": "N", "matrix": [3, 7], "x":7.25, "y":3 },
-                { "label": "M", "matrix": [3, 8], "x":8.25, "y":3 },
-                { "label": ",<", "matrix": [3, 9], "x":9.25, "y":3 },
-                { "label": ".>", "matrix": [3, 10], "x":10.25, "y":3 },
-                { "label": "/?", "matrix": [3, 11], "x":11.25, "y":3 },
-                { "label": "Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+                {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3},
+                {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3},
+                {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "label": "GUI", "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "label": "Space", "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
-                { "label": "Fn", "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-                { "label": "Alt", "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-                { "label": "Menu", "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-                { "label": "Ctrl", "matrix": [4, 13], "x":13.75, "y":4, "w":1.25 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index f21a9ecd67..55f19ba9cc 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -34,77 +34,77 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0 },
-                { "matrix": [0, 1], "x":1, "y":0 },
-                { "matrix": [0, 2], "x":2, "y":0 },
-                { "matrix": [0, 3], "x":3, "y":0 },
-                { "matrix": [0, 4], "x":4, "y":0 },
-                { "matrix": [0, 5], "x":5, "y":0 },
-                { "matrix": [0, 6], "x":6, "y":0 },
-                { "matrix": [0, 7], "x":7, "y":0 },
-                { "matrix": [0, 8], "x":8, "y":0 },
-                { "matrix": [0, 9], "x":9, "y":0 },
-                { "matrix": [0, 10], "x":10, "y":0 },
-                { "matrix": [0, 11], "x":11, "y":0 },
-                { "matrix": [0, 12], "x":12, "y":0 },
-                { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-                { "matrix": [0, 14], "x":15, "y":0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-                { "matrix": [1, 1], "x":1.5, "y":1 },
-                { "matrix": [1, 2], "x":2.5, "y":1 },
-                { "matrix": [1, 3], "x":3.5, "y":1 },
-                { "matrix": [1, 4], "x":4.5, "y":1 },
-                { "matrix": [1, 5], "x":5.5, "y":1 },
-                { "matrix": [1, 6], "x":6.5, "y":1 },
-                { "matrix": [1, 7], "x":7.5, "y":1 },
-                { "matrix": [1, 8], "x":8.5, "y":1 },
-                { "matrix": [1, 9], "x":9.5, "y":1 },
-                { "matrix": [1, 10], "x":10.5, "y":1 },
-                { "matrix": [1, 11], "x":11.5, "y":1 },
-                { "matrix": [1, 12], "x":12.5, "y":1 },
-                { "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 },
-                { "matrix": [1, 14], "x":15, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-                { "matrix": [2, 1], "x":1.75, "y":2 },
-                { "matrix": [2, 2], "x":2.75, "y":2 },
-                { "matrix": [2, 3], "x":3.75, "y":2 },
-                { "matrix": [2, 4], "x":4.75, "y":2 },
-                { "matrix": [2, 5], "x":5.75, "y":2 },
-                { "matrix": [2, 6], "x":6.75, "y":2 },
-                { "matrix": [2, 7], "x":7.75, "y":2 },
-                { "matrix": [2, 8], "x":8.75, "y":2 },
-                { "matrix": [2, 9], "x":9.75, "y":2 },
-                { "matrix": [2, 10], "x":10.75, "y":2 },
-                { "matrix": [2, 11], "x":11.75, "y":2 },
-                { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-                { "matrix": [2, 14], "x":15, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-                { "matrix": [3, 2], "x":2.25, "y":3 },
-                { "matrix": [3, 3], "x":3.25, "y":3 },
-                { "matrix": [3, 4], "x":4.25, "y":3 },
-                { "matrix": [3, 5], "x":5.25, "y":3 },
-                { "matrix": [3, 6], "x":6.25, "y":3 },
-                { "matrix": [3, 7], "x":7.25, "y":3 },
-                { "matrix": [3, 8], "x":8.25, "y":3 },
-                { "matrix": [3, 9], "x":9.25, "y":3 },
-                { "matrix": [3, 10], "x":10.25, "y":3 },
-                { "matrix": [3, 11], "x":11.25, "y":3 },
-                { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-                { "matrix": [3, 13], "x":14, "y":3 },
-                { "matrix": [3, 14], "x":15, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "matrix": [4, 3], "x":2.5, "y":4, "w":1.25 },
-                { "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 },
-                { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-                { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-                { "matrix": [4, 12], "x":13, "y":4 },
-                { "matrix": [4, 13], "x":14, "y":4 },
-                { "matrix": [4, 14], "x":15, "y":4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json
index 3fd59d1dd4..5a78220ee2 100644
--- a/keyboards/idobao/id80/v2/ansi/info.json
+++ b/keyboards/idobao/id80/v2/ansi/info.json
@@ -6,91 +6,91 @@
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
-                {"label":"Esc", "matrix":[0, 5], "x":0, "y":0},
-                {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0},
-                {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0},
-                {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0},
-                {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0},
-                {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0},
-                {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0},
-                {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0},
-                {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0},
-                {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0},
-                {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0},
-                {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0},
-                {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0},
-                {"label":"Fn", "matrix":[6, 10], "x":14, "y":0},
-                {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0},
+                {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0},
+                {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0},
 
-                {"label":"`", "matrix":[0, 4], "x":0, "y":1.25},
-                {"label":"1", "matrix":[1, 4], "x":1, "y":1.25},
-                {"label":"2", "matrix":[2, 4], "x":2, "y":1.25},
-                {"label":"3", "matrix":[3, 4], "x":3, "y":1.25},
-                {"label":"4", "matrix":[4, 4], "x":4, "y":1.25},
-                {"label":"5", "matrix":[5, 4], "x":5, "y":1.25},
-                {"label":"6", "matrix":[6, 4], "x":6, "y":1.25},
-                {"label":"7", "matrix":[7, 4], "x":7, "y":1.25},
-                {"label":"8", "matrix":[8, 4], "x":8, "y":1.25},
-                {"label":"9", "matrix":[8, 9], "x":9, "y":1.25},
-                {"label":"0", "matrix":[7, 9], "x":10, "y":1.25},
-                {"label":"-", "matrix":[5, 9], "x":11, "y":1.25},
-                {"label":"=", "matrix":[4, 9], "x":12, "y":1.25},
-                {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2},
-                {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25},
+                {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.2, "w":1.55},
-                {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25},
-                {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25},
-                {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25},
-                {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25},
-                {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25},
-                {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25},
-                {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25},
-                {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25},
-                {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25},
-                {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25},
-                {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25},
-                {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25},
-                {"label":"\\", "matrix":[3, 8], "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25},
+                {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.2, "w": 1.55},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"label": "\\", "matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25},
-                {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25},
-                {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25},
-                {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25},
-                {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25},
-                {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25},
-                {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25},
-                {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25},
-                {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25},
-                {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25},
-                {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25, "w":2.25},
+                {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25},
-                {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25},
-                {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25},
-                {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25},
-                {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25},
-                {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25},
-                {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25},
-                {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25},
-                {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25},
-                {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25},
-                {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75},
-                {"label":"\u2191", "matrix":[3, 6], "x":14.25, "y":4.5},
+                {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25},
-                {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5},
-                {"label":"\u2190", "matrix":[5, 0], "x":13.25, "y":5.5},
-                {"label":"\u2193", "matrix":[4, 0], "x":14.25, "y":5.5},
-                {"label":"\u2192", "matrix":[3, 0], "x":15.25, "y":5.5}
+                {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "Win", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "K06", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "\u2190", "matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"label": "\u2193", "matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"label": "\u2192", "matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json
index b35f559e48..cdaeab4251 100644
--- a/keyboards/idobao/id80/v2/iso/info.json
+++ b/keyboards/idobao/id80/v2/iso/info.json
@@ -6,92 +6,92 @@
     "layouts": {
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "matrix":[0, 5], "x":0, "y":0},
-                {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0},
-                {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0},
-                {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0},
-                {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0},
-                {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0},
-                {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0},
-                {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0},
-                {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0},
-                {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0},
-                {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0},
-                {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0},
-                {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0},
-                {"label":"Fn", "matrix":[6, 10], "x":14, "y":0},
-                {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0},
+                {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0},
+                {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0},
+                {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0},
+                {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0},
+                {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0},
+                {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0},
+                {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0},
+                {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0},
+                {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0},
+                {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0},
 
-                {"label":"`", "matrix":[0, 4], "x":0, "y":1.25},
-                {"label":"1", "matrix":[1, 4], "x":1, "y":1.25},
-                {"label":"2", "matrix":[2, 4], "x":2, "y":1.25},
-                {"label":"3", "matrix":[3, 4], "x":3, "y":1.25},
-                {"label":"4", "matrix":[4, 4], "x":4, "y":1.25},
-                {"label":"5", "matrix":[5, 4], "x":5, "y":1.25},
-                {"label":"6", "matrix":[6, 4], "x":6, "y":1.25},
-                {"label":"7", "matrix":[7, 4], "x":7, "y":1.25},
-                {"label":"8", "matrix":[8, 4], "x":8, "y":1.25},
-                {"label":"9", "matrix":[8, 9], "x":9, "y":1.25},
-                {"label":"0", "matrix":[7, 9], "x":10, "y":1.25},
-                {"label":"-", "matrix":[5, 9], "x":11, "y":1.25},
-                {"label":"=", "matrix":[4, 9], "x":12, "y":1.25},
-                {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2},
-                {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25},
+                {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25},
-                {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25},
-                {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25},
-                {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25},
-                {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25},
-                {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25},
-                {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25},
-                {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25},
-                {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25},
-                {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25},
-                {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25},
-                {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25},
-                {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25},
+                {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25},
-                {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25},
-                {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25},
-                {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25},
-                {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25},
-                {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25},
-                {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25},
-                {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25},
-                {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25},
-                {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25},
-                {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25},
-                {"label":"ISO #", "matrix":[4, 7], "x":12.75, "y":3.25},
-                {"label":"Enter", "matrix":[3, 8], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"label": "ISO #", "matrix": [4, 7], "x": 12.75, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 8], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO \\", "matrix":[1, 1], "x":1.25, "y":4.25},
-                {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25},
-                {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25},
-                {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25},
-                {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25},
-                {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25},
-                {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25},
-                {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25},
-                {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25},
-                {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25},
-                {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25},
-                {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Up", "matrix":[3, 6], "x":14.25, "y":4.5},
+                {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 1.25},
+                {"label": "ISO \\", "matrix": [1, 1], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"label": "Up", "matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5},
-                {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5},
-                {"label":"Left", "matrix":[5, 0], "x":13.25, "y":5.5},
-                {"label":"Down", "matrix":[4, 0], "x":14.25, "y":5.5},
-                {"label":"Right", "matrix":[3, 0], "x":15.25, "y":5.5}
+                {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Left", "matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"label": "Down", "matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"label": "Right", "matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index 7788a941f4..816e55208f 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -37,93 +37,93 @@
     "layouts": {
         "LAYOUT_80_ansi": {
             "layout": [
-                { "matrix": [0, 5], "x": 0, "y": 0 },
-                { "matrix": [1, 5], "x": 1.25, "y": 0 },
-                { "matrix": [2, 5], "x": 2.25, "y": 0 },
-                { "matrix": [3, 5], "x": 3.25, "y": 0 },
-                { "matrix": [4, 5], "x": 4.25, "y": 0 },
-                { "matrix": [5, 5], "x": 5.5, "y": 0 },
-                { "matrix": [6, 5], "x": 6.5, "y": 0 },
-                { "matrix": [7, 5], "x": 7.5, "y": 0 },
-                { "matrix": [8, 5], "x": 8.5, "y": 0 },
-                { "matrix": [7, 10], "x": 9.75, "y": 0 },
-                { "matrix": [5, 10], "x": 10.75, "y": 0 },
-                { "matrix": [4, 10], "x": 11.75, "y": 0 },
-                { "matrix": [3, 10], "x": 12.75, "y": 0 },
-                { "matrix": [6, 10], "x": 14, "y": 0 },
-                { "matrix": [2, 10], "x": 15.25, "y": 0 },
+                {"matrix": [0, 5], "x": 0, "y": 0},
+                {"matrix": [1, 5], "x": 1.25, "y": 0},
+                {"matrix": [2, 5], "x": 2.25, "y": 0},
+                {"matrix": [3, 5], "x": 3.25, "y": 0},
+                {"matrix": [4, 5], "x": 4.25, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [6, 5], "x": 6.5, "y": 0},
+                {"matrix": [7, 5], "x": 7.5, "y": 0},
+                {"matrix": [8, 5], "x": 8.5, "y": 0},
+                {"matrix": [7, 10], "x": 9.75, "y": 0},
+                {"matrix": [5, 10], "x": 10.75, "y": 0},
+                {"matrix": [4, 10], "x": 11.75, "y": 0},
+                {"matrix": [3, 10], "x": 12.75, "y": 0},
+                {"matrix": [6, 10], "x": 14, "y": 0},
+                {"matrix": [2, 10], "x": 15.25, "y": 0},
 
-                { "matrix": [0, 4], "x": 0, "y": 1.25 },
-                { "matrix": [1, 4], "x": 1, "y": 1.25 },
-                { "matrix": [2, 4], "x": 2, "y": 1.25 },
-                { "matrix": [3, 4], "x": 3, "y": 1.25 },
-                { "matrix": [4, 4], "x": 4, "y": 1.25 },
-                { "matrix": [5, 4], "x": 5, "y": 1.25 },
-                { "matrix": [6, 4], "x": 6, "y": 1.25 },
-                { "matrix": [7, 4], "x": 7, "y": 1.25 },
-                { "matrix": [8, 4], "x": 8, "y": 1.25 },
-                { "matrix": [8, 9], "x": 9, "y": 1.25 },
-                { "matrix": [7, 9], "x": 10, "y": 1.25 },
-                { "matrix": [5, 9], "x": 11, "y": 1.25 },
-                { "matrix": [4, 9], "x": 12, "y": 1.25 },
-                { "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2 },
-                { "matrix": [2, 9], "x": 15.25, "y": 1.25 },
+                {"matrix": [0, 4], "x": 0, "y": 1.25},
+                {"matrix": [1, 4], "x": 1, "y": 1.25},
+                {"matrix": [2, 4], "x": 2, "y": 1.25},
+                {"matrix": [3, 4], "x": 3, "y": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 1.25},
+                {"matrix": [6, 4], "x": 6, "y": 1.25},
+                {"matrix": [7, 4], "x": 7, "y": 1.25},
+                {"matrix": [8, 4], "x": 8, "y": 1.25},
+                {"matrix": [8, 9], "x": 9, "y": 1.25},
+                {"matrix": [7, 9], "x": 10, "y": 1.25},
+                {"matrix": [5, 9], "x": 11, "y": 1.25},
+                {"matrix": [4, 9], "x": 12, "y": 1.25},
+                {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [2, 9], "x": 15.25, "y": 1.25},
 
-                { "matrix": [0, 3], "x":0, "y":2.25, "w":1.5},
-                { "matrix": [1, 3], "x":1.5, "y":2.25},
-                { "matrix": [2, 3], "x":2.5, "y":2.25},
-                { "matrix": [3, 3], "x":3.5, "y":2.25},
-                { "matrix": [4, 3], "x":4.5, "y":2.25},
-                { "matrix": [5, 3], "x":5.5, "y":2.25},
-                { "matrix": [6, 3], "x":6.5, "y":2.25},
-                { "matrix": [7, 3], "x":7.5, "y":2.25},
-                { "matrix": [8, 3], "x":8.5, "y":2.25},
-                { "matrix": [8, 8], "x":9.5, "y":2.25},
-                { "matrix": [7, 8], "x":10.5, "y":2.25},
-                { "matrix": [5, 8], "x":11.5, "y":2.25},
-                { "matrix": [4, 8], "x":12.5, "y":2.25},
-                { "matrix": [3, 8], "x":13.5, "y":2.25, "w":1.5},
-                { "matrix": [2, 8], "x":15.25, "y":2.25},
+                {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 3], "x": 6.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [8, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 8], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 2.25},
+                {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 8], "x": 15.25, "y": 2.25},
 
-                { "matrix": [0, 2], "x":0, "y":3.25, "w":1.75},
-                { "matrix": [1, 2], "x":1.75, "y":3.25},
-                { "matrix": [2, 2], "x":2.75, "y":3.25},
-                { "matrix": [3, 2], "x":3.75, "y":3.25},
-                { "matrix": [4, 2], "x":4.75, "y":3.25},
-                { "matrix": [5, 2], "x":5.75, "y":3.25},
-                { "matrix": [6, 2], "x":6.75, "y":3.25},
-                { "matrix": [7, 2], "x":7.75, "y":3.25},
-                { "matrix": [8, 2], "x":8.75, "y":3.25},
-                { "matrix": [8, 7], "x":9.75, "y":3.25},
-                { "matrix": [7, 7], "x":10.75, "y":3.25},
-                { "matrix": [5, 7], "x":11.75, "y":3.25},
-                { "matrix": [4, 7], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 2], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 2], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 9.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 10.75, "y": 3.25},
+                {"matrix": [5, 7], "x": 11.75, "y": 3.25},
+                {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                { "matrix": [0, 1], "x":0, "y":4.25, "w":2.25},
-                { "matrix": [2, 1], "x":2.25, "y":4.25},
-                { "matrix": [3, 1], "x":3.25, "y":4.25},
-                { "matrix": [4, 1], "x":4.25, "y":4.25},
-                { "matrix": [5, 1], "x":5.25, "y":4.25},
-                { "matrix": [6, 1], "x":6.25, "y":4.25},
-                { "matrix": [7, 1], "x":7.25, "y":4.25},
-                { "matrix": [8, 1], "x":8.25, "y":4.25},
-                { "matrix": [8, 6], "x":9.25, "y":4.25},
-                { "matrix": [7, 6], "x":10.25, "y":4.25},
-                { "matrix": [5, 6], "x":11.25, "y":4.25},
-                { "matrix": [4, 6], "x":12.25, "y":4.25, "w":1.75},
+                {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [2, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [5, 1], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 1], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 1], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 6], "x": 10.25, "y": 4.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75},
 
-                { "matrix": [3, 6], "x":14.25, "y":4.5},
+                {"matrix": [3, 6], "x": 14.25, "y": 4.5},
 
-                { "matrix": [0, 0], "x":0, "y":5.25, "w":1.25},
-                { "matrix": [1, 0], "x":1.25, "y":5.25, "w":1.25},
-                { "matrix": [2, 0], "x":2.5, "y":5.25, "w":1.25},
-                { "matrix": [6, 0], "x":3.75, "y":5.25, "w":6.25},
-                { "matrix": [8, 0], "x":10, "y":5.25, "w":1.5},
-                { "matrix": [7, 0], "x":11.5, "y":5.25, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5},
 
-                { "matrix": [5, 0], "x":13.25, "y":5.5},
-                { "matrix": [4, 0], "x":14.25, "y":5.5},
-                { "matrix": [3, 0], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 0], "x": 14.25, "y": 5.5},
+                {"matrix": [3, 0], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/jels/boaty/info.json b/keyboards/jels/boaty/info.json
index b14eb858d8..ca6257f6ef 100644
--- a/keyboards/jels/boaty/info.json
+++ b/keyboards/jels/boaty/info.json
@@ -8,10 +8,9 @@
     },
     "url": "",
     "maintainer": "Jels",
-    "processor":"atmega328p",
-    "bootloader":"usbasploader",
-    "features":
-    {
+    "processor": "atmega328p",
+    "bootloader": "usbasploader",
+    "features": {
         "bootmagic": true,
         "nkro": false,
         "mousekey": false,
@@ -28,69 +27,69 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Num Lock", "matrix": [2, 10], "x":6.75, "y": 0 },
-                { "label": "-", "matrix": [1, 10], "x":6.75, "y": 1 },
-                { "label": "*", "matrix": [1, 9], "x":7.75, "y": 1 },
-                { "label": "7", "matrix": [0, 8], "x":6.75, "y": 2 },
-                { "label": "8", "matrix": [0, 9], "x":7.75, "y": 2 },
-                { "label": "9", "matrix": [0, 10], "x":8.75, "y": 2 },
-                { "label": "4", "matrix": [0, 4], "x":6.75, "y": 3 },
-                { "label": "5", "matrix": [0, 5], "x":7.75, "y": 3 },
-                { "label": "6", "matrix": [0, 6], "x":8.75, "y": 3 },
-                { "label": "+", "matrix": [0, 7], "x":9.75, "y": 3 },
-                { "label": "1", "matrix": [1, 4], "x":6.75, "y": 4 },
-                { "label": "2", "matrix": [1, 5], "x":7.75, "y": 4 },
-                { "label": "3", "matrix": [1, 6], "x":8.75, "y": 4 },
-                { "label": "Ent", "matrix": [1, 7], "x":9.75, "y": 4 },
-                { "label": "/", "matrix": [1, 8], "x":10.75, "y": 4 },
-                { "label": "0", "matrix": [2, 4], "x":6.75, "y": 5 },
-                { "label": "00", "matrix": [2, 5], "x":7.75, "y": 5 },
-                { "label": ".", "matrix": [2, 6], "x":8.75, "y": 5 },
-                { "label": "Ent", "matrix": [2, 7], "x":9.75, "y": 5 },
-                { "label": "=", "matrix": [2, 8], "x":10.75, "y": 5 },
-                { "label": "Back", "matrix": [2, 9], "x":11.75, "y": 5 },
-                { "label": "Esc", "matrix": [6, 0], "x":0, "y": 7.25 },
-                { "label": "Tab", "matrix": [4, 0], "x":1, "y": 7.25 },
-                { "label": "Q", "matrix": [5, 0], "x":2, "y": 7.25 },
-                { "label": "W", "matrix": [5, 1], "x":3, "y": 7.25 },
-                { "label": "E", "matrix": [5, 2], "x":4, "y": 7.25 },
-                { "label": "R", "matrix": [5, 3], "x":5, "y": 7.25 },
-                { "label": "T", "matrix": [5, 4], "x":6, "y": 7.25 },
-                { "label": "Y", "matrix": [3, 5], "x":7, "y": 7.25 },
-                { "label": "U", "matrix": [3, 6], "x":8, "y": 7.25 },
-                { "label": "I", "matrix": [3, 7], "x":9, "y": 7.25 },
-                { "label": "O", "matrix": [3, 8], "x":10, "y": 7.25 },
-                { "label": "P", "matrix": [3, 9], "x":11, "y": 7.25 },
-                { "label": "Back", "matrix": [3, 10], "x":12, "y": 7.25 },
-                { "label": "Del", "matrix": [5, 10], "x":13, "y": 7.25 },
-                { "label": "Caps", "matrix": [6, 1], "x":1, "y": 8.25 },
-                { "label": "A", "matrix": [3, 0], "x":2, "y": 8.25 },
-                { "label": "S", "matrix": [3, 1], "x":3, "y": 8.25 },
-                { "label": "D", "matrix": [3, 2], "x":4, "y": 8.25 },
-                { "label": "F", "matrix": [3, 3], "x":5, "y": 8.25 },
-                { "label": "G", "matrix": [3, 4], "x":6, "y": 8.25 },
-                { "label": "H", "matrix": [4, 5], "x":7, "y": 8.25 },
-                { "label": "J", "matrix": [4, 6], "x":8, "y": 8.25 },
-                { "label": "K", "matrix": [4, 7], "x":9, "y": 8.25 },
-                { "label": "L", "matrix": [4, 8], "x":10, "y": 8.25 },
-                { "label": ":", "matrix": [4, 9], "x":11, "y": 8.25 },
-                { "label": "Enter", "matrix": [4, 10], "x":12, "y": 8.25 },
-                { "label": "Shift", "matrix": [6, 2], "x":2, "y": 9.25 },
-                { "label": "Z", "matrix": [4, 1], "x":3, "y": 9.25 },
-                { "label": "X", "matrix": [4, 2], "x":4, "y": 9.25 },
-                { "label": "C", "matrix": [4, 3], "x":5, "y": 9.25 },
-                { "label": "V", "matrix": [4, 4], "x":6, "y": 9.25 },
-                { "label": "B", "matrix": [5, 5], "x":7, "y": 9.25 },
-                { "label": "N", "matrix": [5, 6], "x":8, "y": 9.25 },
-                { "label": "M", "matrix": [5, 7], "x":9, "y": 9.25 },
-                { "label": "<", "matrix": [5, 8], "x":10, "y": 9.25 },
-                { "label": "Shift", "matrix": [5, 9], "x":11, "y": 9.25 },
-                { "label": "Ctl", "matrix": [6, 3], "x":4, "y": 10.25 },
-                { "label": "Alt", "matrix": [6, 4], "x":5, "y": 10.25 },
-                { "matrix": [6, 6], "x":6, "y": 10.25 },
-                { "matrix": [6, 7], "x":7, "y": 10.25 },
-                { "label": "Alt", "matrix": [6, 8], "x":8, "y": 10.25 },
-                { "label": "Ctl", "matrix": [6, 9], "x":9, "y": 10.25 }
+                {"label": "Num Lock", "matrix": [2, 10], "x": 6.75, "y": 0},
+                {"label": "-", "matrix": [1, 10], "x": 6.75, "y": 1},
+                {"label": "*", "matrix": [1, 9], "x": 7.75, "y": 1},
+                {"label": "7", "matrix": [0, 8], "x": 6.75, "y": 2},
+                {"label": "8", "matrix": [0, 9], "x": 7.75, "y": 2},
+                {"label": "9", "matrix": [0, 10], "x": 8.75, "y": 2},
+                {"label": "4", "matrix": [0, 4], "x": 6.75, "y": 3},
+                {"label": "5", "matrix": [0, 5], "x": 7.75, "y": 3},
+                {"label": "6", "matrix": [0, 6], "x": 8.75, "y": 3},
+                {"label": "+", "matrix": [0, 7], "x": 9.75, "y": 3},
+                {"label": "1", "matrix": [1, 4], "x": 6.75, "y": 4},
+                {"label": "2", "matrix": [1, 5], "x": 7.75, "y": 4},
+                {"label": "3", "matrix": [1, 6], "x": 8.75, "y": 4},
+                {"label": "Ent", "matrix": [1, 7], "x": 9.75, "y": 4},
+                {"label": "/", "matrix": [1, 8], "x": 10.75, "y": 4},
+                {"label": "0", "matrix": [2, 4], "x": 6.75, "y": 5},
+                {"label": "00", "matrix": [2, 5], "x": 7.75, "y": 5},
+                {"label": ".", "matrix": [2, 6], "x": 8.75, "y": 5},
+                {"label": "Ent", "matrix": [2, 7], "x": 9.75, "y": 5},
+                {"label": "=", "matrix": [2, 8], "x": 10.75, "y": 5},
+                {"label": "Back", "matrix": [2, 9], "x": 11.75, "y": 5},
+                {"label": "Esc", "matrix": [6, 0], "x": 0, "y": 7.25},
+                {"label": "Tab", "matrix": [4, 0], "x": 1, "y": 7.25},
+                {"label": "Q", "matrix": [5, 0], "x": 2, "y": 7.25},
+                {"label": "W", "matrix": [5, 1], "x": 3, "y": 7.25},
+                {"label": "E", "matrix": [5, 2], "x": 4, "y": 7.25},
+                {"label": "R", "matrix": [5, 3], "x": 5, "y": 7.25},
+                {"label": "T", "matrix": [5, 4], "x": 6, "y": 7.25},
+                {"label": "Y", "matrix": [3, 5], "x": 7, "y": 7.25},
+                {"label": "U", "matrix": [3, 6], "x": 8, "y": 7.25},
+                {"label": "I", "matrix": [3, 7], "x": 9, "y": 7.25},
+                {"label": "O", "matrix": [3, 8], "x": 10, "y": 7.25},
+                {"label": "P", "matrix": [3, 9], "x": 11, "y": 7.25},
+                {"label": "Back", "matrix": [3, 10], "x": 12, "y": 7.25},
+                {"label": "Del", "matrix": [5, 10], "x": 13, "y": 7.25},
+                {"label": "Caps", "matrix": [6, 1], "x": 1, "y": 8.25},
+                {"label": "A", "matrix": [3, 0], "x": 2, "y": 8.25},
+                {"label": "S", "matrix": [3, 1], "x": 3, "y": 8.25},
+                {"label": "D", "matrix": [3, 2], "x": 4, "y": 8.25},
+                {"label": "F", "matrix": [3, 3], "x": 5, "y": 8.25},
+                {"label": "G", "matrix": [3, 4], "x": 6, "y": 8.25},
+                {"label": "H", "matrix": [4, 5], "x": 7, "y": 8.25},
+                {"label": "J", "matrix": [4, 6], "x": 8, "y": 8.25},
+                {"label": "K", "matrix": [4, 7], "x": 9, "y": 8.25},
+                {"label": "L", "matrix": [4, 8], "x": 10, "y": 8.25},
+                {"label": ":", "matrix": [4, 9], "x": 11, "y": 8.25},
+                {"label": "Enter", "matrix": [4, 10], "x": 12, "y": 8.25},
+                {"label": "Shift", "matrix": [6, 2], "x": 2, "y": 9.25},
+                {"label": "Z", "matrix": [4, 1], "x": 3, "y": 9.25},
+                {"label": "X", "matrix": [4, 2], "x": 4, "y": 9.25},
+                {"label": "C", "matrix": [4, 3], "x": 5, "y": 9.25},
+                {"label": "V", "matrix": [4, 4], "x": 6, "y": 9.25},
+                {"label": "B", "matrix": [5, 5], "x": 7, "y": 9.25},
+                {"label": "N", "matrix": [5, 6], "x": 8, "y": 9.25},
+                {"label": "M", "matrix": [5, 7], "x": 9, "y": 9.25},
+                {"label": "<", "matrix": [5, 8], "x": 10, "y": 9.25},
+                {"label": "Shift", "matrix": [5, 9], "x": 11, "y": 9.25},
+                {"label": "Ctl", "matrix": [6, 3], "x": 4, "y": 10.25},
+                {"label": "Alt", "matrix": [6, 4], "x": 5, "y": 10.25},
+                {"matrix": [6, 6], "x": 6, "y": 10.25},
+                {"matrix": [6, 7], "x": 7, "y": 10.25},
+                {"label": "Alt", "matrix": [6, 8], "x": 8, "y": 10.25},
+                {"label": "Ctl", "matrix": [6, 9], "x": 9, "y": 10.25}
             ]
         }
     }
diff --git a/keyboards/jolofsor/denial75/info.json b/keyboards/jolofsor/denial75/info.json
index c0381a5f84..1ae7240e1c 100644
--- a/keyboards/jolofsor/denial75/info.json
+++ b/keyboards/jolofsor/denial75/info.json
@@ -25,95 +25,95 @@
     "layouts": {
         "LAYOUT_denial75_ansi": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1.25, "y":0, "matrix": [0, 1]},
-                {"x":2.25, "y":0, "matrix": [0, 2]},
-                {"x":3.25, "y":0, "matrix": [0, 3]},
-                {"x":4.25, "y":0, "matrix": [0, 4]},
-                {"x":5.25, "y":0, "matrix": [0, 5]},
-                {"x":6.25, "y":0, "matrix": [0, 6]},
-                {"x":7.25, "y":0, "matrix": [0, 7]},
-                {"x":8.25, "y":0, "matrix": [0, 8]},
-                {"x":9.25, "y":0, "matrix": [0, 9]},
-                {"x":10.25, "y":0, "matrix": [0, 10]},
-                {"x":11.25, "y":0, "matrix": [0, 11]},
-                {"x":12.25, "y":0, "matrix": [0, 12]},
-                {"x":13.5, "y":0, "matrix": [0, 13]},
-                {"x":14.5, "y":0, "matrix": [0, 14]},
-                {"x":15.5, "y":0, "matrix": [0, 15]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1.25, "y": 0, "matrix": [0, 1]},
+                {"x": 2.25, "y": 0, "matrix": [0, 2]},
+                {"x": 3.25, "y": 0, "matrix": [0, 3]},
+                {"x": 4.25, "y": 0, "matrix": [0, 4]},
+                {"x": 5.25, "y": 0, "matrix": [0, 5]},
+                {"x": 6.25, "y": 0, "matrix": [0, 6]},
+                {"x": 7.25, "y": 0, "matrix": [0, 7]},
+                {"x": 8.25, "y": 0, "matrix": [0, 8]},
+                {"x": 9.25, "y": 0, "matrix": [0, 9]},
+                {"x": 10.25, "y": 0, "matrix": [0, 10]},
+                {"x": 11.25, "y": 0, "matrix": [0, 11]},
+                {"x": 12.25, "y": 0, "matrix": [0, 12]},
+                {"x": 13.5, "y": 0, "matrix": [0, 13]},
+                {"x": 14.5, "y": 0, "matrix": [0, 14]},
+                {"x": 15.5, "y": 0, "matrix": [0, 15]},
 
-                {"x":0, "y":1.25, "matrix": [1, 0]},
-                {"x":1, "y":1.25, "matrix": [1, 1]},
-                {"x":2, "y":1.25, "matrix": [1, 2]},
-                {"x":3, "y":1.25, "matrix": [1, 3]},
-                {"x":4, "y":1.25, "matrix": [1, 4]},
-                {"x":5, "y":1.25, "matrix": [1, 5]},
-                {"x":6, "y":1.25, "matrix": [1, 6]},
-                {"x":7, "y":1.25, "matrix": [1, 7]},
-                {"x":8, "y":1.25, "matrix": [1, 8]},
-                {"x":9, "y":1.25, "matrix": [1, 9]},
-                {"x":10, "y":1.25, "matrix": [1, 10]},
-                {"x":11, "y":1.25, "matrix": [1, 11]},
-                {"x":12, "y":1.25, "matrix": [1, 12]},
-                {"x":13, "y":1.25, "w":2, "matrix": [1, 14]},
-                {"x":15.5, "y":1.25, "matrix": [1, 15]},
+                {"x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"x": 13, "y": 1.25, "w": 2, "matrix": [1, 14]},
+                {"x": 15.5, "y": 1.25, "matrix": [1, 15]},
 
-                {"x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"x":1.5, "y":2.25, "matrix": [2, 2]},
-                {"x":2.5, "y":2.25, "matrix": [2, 3]},
-                {"x":3.5, "y":2.25, "matrix": [2, 4]},
-                {"x":4.5, "y":2.25, "matrix": [2, 5]},
-                {"x":5.5, "y":2.25, "matrix": [2, 6]},
-                {"x":6.5, "y":2.25, "matrix": [2, 7]},
-                {"x":7.5, "y":2.25, "matrix": [2, 8]},
-                {"x":8.5, "y":2.25, "matrix": [2, 9]},
-                {"x":9.5, "y":2.25, "matrix": [2, 10]},
-                {"x":10.5, "y":2.25, "matrix": [2, 11]},
-                {"x":11.5, "y":2.25, "matrix": [2, 12]},
-                {"x":12.5, "y":2.25, "matrix": [2, 13]},
-                {"x":13.5, "y":2.25, "w":1.5, "matrix": [2, 14]},
-                {"x":15.5, "y":2.25, "matrix": [2, 15]},
+                {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"x": 1.5, "y": 2.25, "matrix": [2, 2]},
+                {"x": 2.5, "y": 2.25, "matrix": [2, 3]},
+                {"x": 3.5, "y": 2.25, "matrix": [2, 4]},
+                {"x": 4.5, "y": 2.25, "matrix": [2, 5]},
+                {"x": 5.5, "y": 2.25, "matrix": [2, 6]},
+                {"x": 6.5, "y": 2.25, "matrix": [2, 7]},
+                {"x": 7.5, "y": 2.25, "matrix": [2, 8]},
+                {"x": 8.5, "y": 2.25, "matrix": [2, 9]},
+                {"x": 9.5, "y": 2.25, "matrix": [2, 10]},
+                {"x": 10.5, "y": 2.25, "matrix": [2, 11]},
+                {"x": 11.5, "y": 2.25, "matrix": [2, 12]},
+                {"x": 12.5, "y": 2.25, "matrix": [2, 13]},
+                {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 14]},
+                {"x": 15.5, "y": 2.25, "matrix": [2, 15]},
 
-                {"x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"x":1.75, "y":3.25, "matrix": [3, 2]},
-                {"x":2.75, "y":3.25, "matrix": [3, 3]},
-                {"x":3.75, "y":3.25, "matrix": [3, 4]},
-                {"x":4.75, "y":3.25, "matrix": [3, 5]},
-                {"x":5.75, "y":3.25, "matrix": [3, 6]},
-                {"x":6.75, "y":3.25, "matrix": [3, 7]},
-                {"x":7.75, "y":3.25, "matrix": [3, 8]},
-                {"x":8.75, "y":3.25, "matrix": [3, 9]},
-                {"x":9.75, "y":3.25, "matrix": [3, 10]},
-                {"x":10.75, "y":3.25, "matrix": [3, 11]},
-                {"x":11.75, "y":3.25, "matrix": [3, 12]},
-                {"x":12.75, "y":3.25, "w":2.25, "matrix": [3, 13]},
-                {"x":15.5, "y":3.25, "matrix": [3, 15]},
+                {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"x": 1.75, "y": 3.25, "matrix": [3, 2]},
+                {"x": 2.75, "y": 3.25, "matrix": [3, 3]},
+                {"x": 3.75, "y": 3.25, "matrix": [3, 4]},
+                {"x": 4.75, "y": 3.25, "matrix": [3, 5]},
+                {"x": 5.75, "y": 3.25, "matrix": [3, 6]},
+                {"x": 6.75, "y": 3.25, "matrix": [3, 7]},
+                {"x": 7.75, "y": 3.25, "matrix": [3, 8]},
+                {"x": 8.75, "y": 3.25, "matrix": [3, 9]},
+                {"x": 9.75, "y": 3.25, "matrix": [3, 10]},
+                {"x": 10.75, "y": 3.25, "matrix": [3, 11]},
+                {"x": 11.75, "y": 3.25, "matrix": [3, 12]},
+                {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [3, 13]},
+                {"x": 15.5, "y": 3.25, "matrix": [3, 15]},
 
-                {"x":0, "y":4.25, "w":2.25, "matrix": [4, 1]},
-                {"x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"x":12.25, "y":4.25, "w":1.75, "matrix": [4, 13]},
-                {"x":14.25, "y":4.5, "matrix": [4, 14]},
-                {"x":15.5, "y":4.25, "matrix": [4, 15]},
+                {"x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 1]},
+                {"x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"x": 12.25, "y": 4.25, "w": 1.75, "matrix": [4, 13]},
+                {"x": 14.25, "y": 4.5, "matrix": [4, 14]},
+                {"x": 15.5, "y": 4.25, "matrix": [4, 15]},
 
-                {"x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
-                {"x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
-                {"x":2.5, "y":5.25, "w":1.25, "matrix": [5, 3]},
-                {"x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
-                {"x":10, "y":5.25, "matrix": [5, 10]},
-                {"x":11, "y":5.25, "matrix": [5, 11]},
-                {"x":12, "y":5.25, "matrix": [5, 12]},
-                {"x":13.25, "y":5.5, "matrix": [5, 13]},
-                {"x":14.25, "y":5.5, "matrix": [5, 14]},
-                {"x":15.25, "y":5.5, "matrix": [5, 15]}
+                {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 3]},
+                {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"x": 10, "y": 5.25, "matrix": [5, 10]},
+                {"x": 11, "y": 5.25, "matrix": [5, 11]},
+                {"x": 12, "y": 5.25, "matrix": [5, 12]},
+                {"x": 13.25, "y": 5.5, "matrix": [5, 13]},
+                {"x": 14.25, "y": 5.5, "matrix": [5, 14]},
+                {"x": 15.25, "y": 5.5, "matrix": [5, 15]}
             ]
         }
     }
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index fb5c391d6a..9fd699ca49 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -20,94 +20,70 @@
     "layouts": {
         "LAYOUT_split4x6_r1": {
             "layout": [
-                { "label": "`", "matrix": [0, 0], "x": 0, "y": 0.7 },
-                { "label": "1", "matrix": [0, 1], "x": 1, "y": 0.7 },
-                { "label": "2", "matrix": [0, 2], "x": 2, "y": 0.3 },
-                { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
-                { "label": "4", "matrix": [0, 4], "x": 4, "y": 0.3 },
-                { "label": "5", "matrix": [0, 5], "x": 5, "y": 0.45 },
-                { "label": "6", "matrix": [5, 5], "x": 9, "y": 0.45 },
-                { "label": "7", "matrix": [5, 4], "x": 10, "y": 0.3 },
-                { "label": "8", "matrix": [5, 3], "x": 11, "y": 0 },
-                { "label": "9", "matrix": [5, 2], "x": 12, "y": 0.3 },
-                { "label": "0", "matrix": [5, 1], "x": 13, "y": 0.7 },
-                { "label": "-", "matrix": [5, 0], "x": 14, "y": 0.7 },
+                {"label": "`", "matrix": [0, 0], "x": 0, "y": 0.7},
+                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0.7},
+                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0.3},
+                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0.3},
+                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0.45},
+                {"label": "6", "matrix": [5, 5], "x": 9, "y": 0.45},
+                {"label": "7", "matrix": [5, 4], "x": 10, "y": 0.3},
+                {"label": "8", "matrix": [5, 3], "x": 11, "y": 0},
+                {"label": "9", "matrix": [5, 2], "x": 12, "y": 0.3},
+                {"label": "0", "matrix": [5, 1], "x": 13, "y": 0.7},
+                {"label": "-", "matrix": [5, 0], "x": 14, "y": 0.7},
 
-                { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7 },
-                { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7 },
-                { "label": "W", "matrix": [1, 2], "x": 2, "y": 1.3 },
-                { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
-                { "label": "R", "matrix": [1, 4], "x": 4, "y": 1.3 },
-                { "label": "T", "matrix": [1, 5], "x": 5, "y": 1.45 },
-                { "label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45 },
-                { "label": "U", "matrix": [6, 4], "x": 10, "y": 1.3 },
-                { "label": "I", "matrix": [6, 3], "x": 11, "y": 1 },
-                { "label": "O", "matrix": [6, 2], "x": 12, "y": 1.3 },
-                { "label": "P", "matrix": [6, 1], "x": 13, "y": 1.7 },
-                { "label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7 },
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.7},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1.7},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1.3},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1.3},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1.45},
+                {"label": "Y", "matrix": [6, 5], "x": 9, "y": 1.45},
+                {"label": "U", "matrix": [6, 4], "x": 10, "y": 1.3},
+                {"label": "I", "matrix": [6, 3], "x": 11, "y": 1},
+                {"label": "O", "matrix": [6, 2], "x": 12, "y": 1.3},
+                {"label": "P", "matrix": [6, 1], "x": 13, "y": 1.7},
+                {"label": "Enter", "matrix": [6, 0], "x": 14, "y": 1.7},
 
-                { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7 },
-                { "label": "A", "matrix": [2, 1], "x": 1, "y": 2.7 },
-                { "label": "S", "matrix": [2, 2], "x": 2, "y": 2.3 },
-                { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
-                { "label": "F", "matrix": [2, 4], "x": 4, "y": 2.3 },
-                { "label": "G", "matrix": [2, 5], "x": 5, "y": 2.45 },
-                { "label": "H", "matrix": [7, 5], "x": 9, "y": 2.45 },
-                { "label": "J", "matrix": [7, 4], "x": 10, "y": 2.3 },
-                { "label": "K", "matrix": [7, 3], "x": 11, "y": 2 },
-                { "label": "L", "matrix": [7, 2], "x": 12, "y": 2.3 },
-                { "label": ";", "matrix": [7, 1], "x": 13, "y": 2.7 },
-                { "label": "'", "matrix": [7, 0], "x": 14, "y": 2.7 },
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2.7},
+                {"label": "A", "matrix": [2, 1], "x": 1, "y": 2.7},
+                {"label": "S", "matrix": [2, 2], "x": 2, "y": 2.3},
+                {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4, "y": 2.3},
+                {"label": "G", "matrix": [2, 5], "x": 5, "y": 2.45},
+                {"label": "H", "matrix": [7, 5], "x": 9, "y": 2.45},
+                {"label": "J", "matrix": [7, 4], "x": 10, "y": 2.3},
+                {"label": "K", "matrix": [7, 3], "x": 11, "y": 2},
+                {"label": "L", "matrix": [7, 2], "x": 12, "y": 2.3},
+                {"label": ";", "matrix": [7, 1], "x": 13, "y": 2.7},
+                {"label": "'", "matrix": [7, 0], "x": 14, "y": 2.7},
 
-                { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7 },
-                { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7 },
-                { "label": "X", "matrix": [3, 2], "x": 2, "y": 3.3 },
-                { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
-                { "label": "V", "matrix": [3, 4], "x": 4, "y": 3.3 },
-                { "label": "B", "matrix": [3, 5], "x": 5, "y": 3.45 },
-                { "label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45 },
-                { "label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45 },
-                { "label": "N", "matrix": [8, 5], "x": 9, "y": 3.45 },
-                { "label": "M", "matrix": [8, 4], "x": 10, "y": 3.3 },
-                { "label": ",", "matrix": [8, 3], "x": 11, "y": 3 },
-                { "label": ".", "matrix": [8, 2], "x": 12, "y": 3.3 },
-                { "label": "/", "matrix": [8, 1], "x": 13, "y": 3.7 },
-                { "label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7 },
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.7},
+                {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3.7},
+                {"label": "X", "matrix": [3, 2], "x": 2, "y": 3.3},
+                {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 4, "y": 3.3},
+                {"label": "B", "matrix": [3, 5], "x": 5, "y": 3.45},
+                {"label": "Mute", "matrix": [4, 5], "x": 6.2, "y": 3.45},
+                {"label": "XXX", "matrix": [9, 5], "x": 7.8, "y": 3.45},
+                {"label": "N", "matrix": [8, 5], "x": 9, "y": 3.45},
+                {"label": "M", "matrix": [8, 4], "x": 10, "y": 3.3},
+                {"label": ",", "matrix": [8, 3], "x": 11, "y": 3},
+                {"label": ".", "matrix": [8, 2], "x": 12, "y": 3.3},
+                {"label": "/", "matrix": [8, 1], "x": 13, "y": 3.7},
+                {"label": "Shift", "matrix": [8, 0], "x": 14, "y": 3.7},
 
-                { "label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3 },
-                { "label": "Win", "matrix": [4, 1], "x": 3, "y": 4 },
-                { "label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3 },
-                {
-                    "label": "Del",
-                    "matrix": [4, 3],
-                    "x": 5.1,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Spc",
-                    "matrix": [4, 4],
-                    "x": 6.1,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Shift",
-                    "matrix": [9, 3],
-                    "x": 7.9,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                {
-                    "label": "Bspc",
-                    "matrix": [9, 4],
-                    "x": 8.9,
-                    "y": 4.5,
-                    "h": 1.5
-                },
-                { "label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3 },
-                { "label": "Win", "matrix": [9, 1], "x": 11, "y": 4 },
-                { "label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3 }
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2, "y": 4.3},
+                {"label": "Win", "matrix": [4, 1], "x": 3, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 4, "y": 4.3},
+                {"label": "Del", "matrix": [4, 3], "x": 5.1, "y": 4.5, "h": 1.5},
+                {"label": "Spc", "matrix": [4, 4], "x": 6.1, "y": 4.5, "h": 1.5},
+                {"label": "Shift", "matrix": [9, 3], "x": 7.9, "y": 4.5, "h": 1.5},
+                {"label": "Bspc", "matrix": [9, 4], "x": 8.9, "y": 4.5, "h": 1.5},
+                {"label": "Alt", "matrix": [9, 2], "x": 10, "y": 4.3},
+                {"label": "Win", "matrix": [9, 1], "x": 11, "y": 4},
+                {"label": "Ctrl", "matrix": [9, 0], "x": 12, "y": 4.3}
             ]
         }
     }
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
index b1a79083bd..87cd3184b9 100644
--- a/keyboards/karlb/kbic65/info.json
+++ b/keyboards/karlb/kbic65/info.json
@@ -5,27 +5,8 @@
     "maintainer": "b-karl",
     "diode_direction": "ROW2COL",
     "matrix_pins": {
-        "cols": [
-            "B2",
-            "B6",
-            "B3",
-            "B1",
-            "F7",
-            "F6",
-            "F5",
-            "F4"
-        ],
-        "rows": [
-            "B5",
-            "D1",
-            "B4",
-            "D0",
-            "E6",
-            "D4",
-            "D7",
-            "C6",
-            "D2"
-        ]
+        "cols": ["B2", "B6", "B3", "B1", "F7", "F6", "F5", "F4"],
+        "rows": ["B5", "D1", "B4", "D0", "E6", "D4", "D7", "C6", "D2"]
     },
     "usb": {
         "vid": "0x424B",
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
index 6b7f531eda..817a8db412 100644
--- a/keyboards/kb_elmo/isolation/info.json
+++ b/keyboards/kb_elmo/isolation/info.json
@@ -21,7 +21,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0.25, "y":0, "w":1.25, "h":2, "matrix": [0, 0]}
+                {"x": 0.25, "y": 0, "w": 1.25, "h": 2, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/kbdcraft/adam64/info.json b/keyboards/kbdcraft/adam64/info.json
index 73354b22a8..cc33c26cc1 100644
--- a/keyboards/kbdcraft/adam64/info.json
+++ b/keyboards/kbdcraft/adam64/info.json
@@ -15,7 +15,7 @@
         "rows": ["C8", "C9", "A8", "A10", "B14"],
         "cols": ["B15", "C6", "C7", "A15", "B7", "C10", "C11", "C12", "D2", "B3", "B4", "B5", "A0", "A1"]
     },
-    "features":{
+    "features": {
         "bootmagic": true,
         "mousekey": true,
         "extrakey": true,
@@ -24,10 +24,10 @@
         "command": false,
         "rgb_matrix": true
     },
-    "rgb_matrix":{
+    "rgb_matrix": {
         "driver": "IS31FL3741",
         "max_brightness": 150,
-        "animations":{
+        "animations": {
             "alphas_mods": true,
             "gradient_up_down": true,
             "gradient_left_right": true,
@@ -65,147 +65,147 @@
             "solid_multisplash": true
         },
         "layout": [
-            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0 },
-            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },
-            {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0 },
-            {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0 },
-            {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0 },
-            {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0 },
-            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0 },
-            {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0 },
-            {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0 },
-            {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0 },
-            {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0 },
-            {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0 },
-            {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0 },
-            {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0 },
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0},
+            {"flags": 4, "matrix": [0, 13], "x": 208, "y": 0},
 
-            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10 },
-            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10 },
-            {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10 },
-            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10 },
-            {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10 },
-            {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10 },
-            {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10 },
-            {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10 },
-            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10 },
-            {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10 },
-            {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10 },
-            {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10 },
-            {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10 },
-            {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10 },
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 10},
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 10},
+            {"flags": 4, "matrix": [1, 2], "x": 32, "y": 10},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 10},
+            {"flags": 4, "matrix": [1, 4], "x": 64, "y": 10},
+            {"flags": 4, "matrix": [1, 5], "x": 80, "y": 10},
+            {"flags": 4, "matrix": [1, 6], "x": 96, "y": 10},
+            {"flags": 4, "matrix": [1, 7], "x": 112, "y": 10},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 10},
+            {"flags": 4, "matrix": [1, 9], "x": 144, "y": 10},
+            {"flags": 4, "matrix": [1, 10], "x": 160, "y": 10},
+            {"flags": 4, "matrix": [1, 11], "x": 176, "y": 10},
+            {"flags": 4, "matrix": [1, 12], "x": 192, "y": 10},
+            {"flags": 4, "matrix": [1, 13], "x": 208, "y": 10},
 
-            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20 },
-            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20 },
-            {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20 },
-            {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20 },
-            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20 },
-            {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20 },
-            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20 },
-            {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20 },
-            {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20 },
-            {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20 },
-            {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20 },
-            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20 },
-            {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20 },
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 20},
+            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 20},
+            {"flags": 4, "matrix": [2, 2], "x": 32, "y": 20},
+            {"flags": 4, "matrix": [2, 3], "x": 48, "y": 20},
+            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 20},
+            {"flags": 4, "matrix": [2, 5], "x": 80, "y": 20},
+            {"flags": 4, "matrix": [2, 6], "x": 96, "y": 20},
+            {"flags": 4, "matrix": [2, 7], "x": 112, "y": 20},
+            {"flags": 4, "matrix": [2, 8], "x": 128, "y": 20},
+            {"flags": 4, "matrix": [2, 9], "x": 144, "y": 20},
+            {"flags": 4, "matrix": [2, 10], "x": 160, "y": 20},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 20},
+            {"flags": 4, "matrix": [2, 13], "x": 208, "y": 20},
 
-            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30 },
-            {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30 },
-            {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30 },
-            {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30 },
-            {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30 },
-            {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30 },
-            {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30 },
-            {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30 },
-            {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30 },
-            {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30 },
-            {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30 },
-            {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30 },
-            {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30 },
-            {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30 },
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 30},
+            {"flags": 4, "matrix": [3, 1], "x": 16, "y": 30},
+            {"flags": 4, "matrix": [3, 2], "x": 32, "y": 30},
+            {"flags": 4, "matrix": [3, 3], "x": 48, "y": 30},
+            {"flags": 4, "matrix": [3, 4], "x": 64, "y": 30},
+            {"flags": 4, "matrix": [3, 5], "x": 80, "y": 30},
+            {"flags": 4, "matrix": [3, 6], "x": 96, "y": 30},
+            {"flags": 4, "matrix": [3, 7], "x": 112, "y": 30},
+            {"flags": 4, "matrix": [3, 8], "x": 128, "y": 30},
+            {"flags": 4, "matrix": [3, 9], "x": 144, "y": 30},
+            {"flags": 4, "matrix": [3, 10], "x": 160, "y": 30},
+            {"flags": 4, "matrix": [3, 11], "x": 176, "y": 30},
+            {"flags": 4, "matrix": [3, 12], "x": 192, "y": 30},
+            {"flags": 4, "matrix": [3, 13], "x": 208, "y": 30},
 
-            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40 },
-            {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40 },
-            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40 },
-            {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40 },
-            {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40 },
-            {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40 },
-            {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40 },
-            {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40 },
-            {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40 }
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [4, 1], "x": 16, "y": 40},
+            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 40},
+            {"flags": 4, "matrix": [4, 5], "x": 80, "y": 40},
+            {"flags": 4, "matrix": [4, 9], "x": 144, "y": 40},
+            {"flags": 4, "matrix": [4, 10], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [4, 11], "x": 176, "y": 40},
+            {"flags": 4, "matrix": [4, 12], "x": 192, "y": 40},
+            {"flags": 4, "matrix": [4, 13], "x": 208, "y": 40}
         ]
     },
     "layouts": {
         "LAYOUT_64_ansi": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
-                { "matrix": [0, 11], "x": 11, "y": 0 },
-                { "matrix": [0, 12], "x": 12, "y": 0 },
-                { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
 
-                { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
 
-                { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
 
-                { "matrix": [3, 0], "w": 2, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 2, "y": 3 },
-                { "matrix": [3, 2], "x": 3, "y": 3 },
-                { "matrix": [3, 3], "x": 4, "y": 3 },
-                { "matrix": [3, 4], "x": 5, "y": 3 },
-                { "matrix": [3, 5], "x": 6, "y": 3 },
-                { "matrix": [3, 6], "x": 7, "y": 3 },
-                { "matrix": [3, 7], "x": 8, "y": 3 },
-                { "matrix": [3, 8], "x": 9, "y": 3 },
-                { "matrix": [3, 9], "x": 10, "y": 3 },
-                { "matrix": [3, 10], "x": 11, "y": 3 },
-                { "matrix": [3, 11], "x": 12, "y": 3 },
-                { "matrix": [3, 12], "x": 13, "y": 3 },
-                { "matrix": [3, 13], "x": 14, "y": 3 },
+                {"matrix": [3, 0], "w": 2, "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
-                { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
-                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
-                { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 },
-                { "matrix": [4, 9], "x": 10, "y": 4 },
-                { "matrix": [4, 10], "x": 11, "y": 4 },
-                { "matrix": [4, 11], "x": 12, "y": 4 },
-                { "matrix": [4, 12], "x": 13, "y": 4 },
-                { "matrix": [4, 13], "x": 14, "y": 4 }
+                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+                {"matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
index d070398c65..77dcc1f7dd 100644
--- a/keyboards/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -28,7 +28,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1.5, "y": 0, "h":2, "w": 2, "matrix": [0, 0]},
+                {"x": 1.5, "y": 0, "h": 2, "w": 2, "matrix": [0, 0]},
                 {"x": 0.5, "y": 2.25, "matrix": [0, 1]},
                 {"x": 3.5, "y": 2.25, "matrix": [0, 2]},
 
diff --git a/keyboards/keebio/bdn9/info.json b/keyboards/keebio/bdn9/info.json
index 19a0241234..bec6df1f2f 100644
--- a/keyboards/keebio/bdn9/info.json
+++ b/keyboards/keebio/bdn9/info.json
@@ -8,15 +8,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json
index dfe8069463..b5f50cc486 100644
--- a/keyboards/keebio/choconum/info.json
+++ b/keyboards/keebio/choconum/info.json
@@ -23,55 +23,55 @@
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "h":2, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "h": 2, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "h":2, "matrix": [3, 3]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "h": 2, "matrix": [3, 3]},
 
-                {"x":0, "y":4, "w":2, "matrix": [4, 0]},
-                {"x":2, "y":4, "matrix": [4, 2]}
+                {"x": 0, "y": 4, "w": 2, "matrix": [4, 0]},
+                {"x": 2, "y": 4, "matrix": [4, 2]}
             ]
         },
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
 
-                {"x":0, "y":4, "matrix": [4, 0]},
-                {"x":1, "y":4, "matrix": [4, 1]},
-                {"x":2, "y":4, "matrix": [4, 2]},
-                {"x":3, "y":4, "matrix": [4, 3]}
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 2, "y": 4, "matrix": [4, 2]},
+                {"x": 3, "y": 4, "matrix": [4, 3]}
             ]
         }
     }
diff --git a/keyboards/keebio/sinc/rev1/info.json b/keyboards/keebio/sinc/rev1/info.json
index 3163e23c59..d9b09568bd 100644
--- a/keyboards/keebio/sinc/rev1/info.json
+++ b/keyboards/keebio/sinc/rev1/info.json
@@ -28,7 +28,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
                 "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
             }
@@ -44,11 +44,11 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
-    "backlight":{
+    "backlight": {
         "pin": "B5"
     },
     "rgblight": {
-        "led_count" : 16,
+        "led_count": 16,
         "split_count": [8, 8],
         "animations": {
             "alternating": true,
diff --git a/keyboards/keebio/sinc/rev2/info.json b/keyboards/keebio/sinc/rev2/info.json
index 5db1ac8642..d9372d9e94 100644
--- a/keyboards/keebio/sinc/rev2/info.json
+++ b/keyboards/keebio/sinc/rev2/info.json
@@ -28,7 +28,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["F1", "F0", "F4", "F5", "F6", "D5", "C7", "D3", "B7"],
                 "rows": ["B3", "B2", "B6", "B4", "D7", "B0"]
             }
@@ -44,11 +44,11 @@
             {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
-    "backlight":{
+    "backlight": {
         "pin": "B5"
     },
     "rgblight": {
-        "led_count" : 16,
+        "led_count": 16,
         "split_count": [8, 8],
         "animations": {
             "alternating": true,
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/info.json
index 0e66d21aa3..76dfd88b3e 100644
--- a/keyboards/keebio/sinc/rev3/info.json
+++ b/keyboards/keebio/sinc/rev3/info.json
@@ -23,7 +23,7 @@
             }
         },
         "matrix_pins": {
-            "right":{
+            "right": {
                 "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
                 "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
             }
@@ -47,132 +47,132 @@
         "driver": "WS2812",
         "split_count": [56, 57],
         "layout": [
-            { "flags": 4, "matrix": [5, 2], "x": 30, "y": 0 },
-            { "flags": 2, "x": 42, "y": 6 },
-            { "flags": 4, "matrix": [5, 3], "x": 45, "y": 0 },
-            { "flags": 4, "matrix": [5, 4], "x": 58, "y": 0 },
-            { "flags": 2, "x": 67, "y": 6 },
-            { "flags": 4, "matrix": [5, 5], "x": 70, "y": 0 },
-            { "flags": 4, "matrix": [5, 6], "x": 82, "y": 0 },
-            { "flags": 4, "matrix": [5, 7], "x": 97, "y": 0 },
-            { "flags": 2, "x": 103, "y": 6 },
-            { "flags": 4, "matrix": [5, 8], "x": 109, "y": 0 },
-
-            { "flags": 4, "matrix": [0, 8], "x": 103, "y": 15 },
-            { "flags": 4, "matrix": [0, 7], "x": 91, "y": 15 },
-            { "flags": 4, "matrix": [0, 6], "x": 79, "y": 15 },
-            { "flags": 4, "matrix": [0, 5], "x": 67, "y": 15 },
-            { "flags": 4, "matrix": [0, 4], "x": 54, "y": 15 },
-            { "flags": 4, "matrix": [0, 3], "x": 42, "y": 15 },
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 15 },
-
-            { "flags": 4, "matrix": [1, 2], "x": 33, "y": 27 },
-            { "flags": 4, "matrix": [1, 3], "x": 48, "y": 27 },
-            { "flags": 4, "matrix": [1, 4], "x": 61, "y": 27 },
-            { "flags": 4, "matrix": [1, 5], "x": 73, "y": 27 },
-            { "flags": 4, "matrix": [1, 6], "x": 85, "y": 27 },
-            { "flags": 4, "matrix": [1, 7], "x": 97, "y": 27 },
-
-            { "flags": 4, "matrix": [2, 7], "x": 100, "y": 40 },
-            { "flags": 4, "matrix": [2, 6], "x": 88, "y": 40 },
-            { "flags": 4, "matrix": [2, 5], "x": 76, "y": 40 },
-            { "flags": 4, "matrix": [2, 4], "x": 64, "y": 40 },
-            { "flags": 4, "matrix": [2, 3], "x": 51, "y": 40 },
-            { "flags": 4, "matrix": [2, 2], "x": 35, "y": 40 },
-
-            { "flags": 4, "matrix": [3, 2], "x": 38, "y": 52 },
-            { "flags": 4, "matrix": [3, 4], "x": 58, "y": 52 },
-            { "flags": 4, "matrix": [3, 5], "x": 70, "y": 52 },
-            { "flags": 4, "matrix": [3, 6], "x": 82, "y": 52 },
-            { "flags": 4, "matrix": [3, 7], "x": 94, "y": 52 },
-            { "flags": 4, "matrix": [3, 8], "x": 106, "y": 52 },
-
-            { "flags": 2, "x": 106, "y": 64 },
-            { "flags": 4, "matrix": [4, 7], "x": 98, "y": 64 },
-            { "flags": 4, "matrix": [4, 5], "x": 77, "y": 64 },
-            { "flags": 2, "x": 67, "y": 64 },
-            { "flags": 4, "matrix": [4, 4], "x": 62, "y": 64 },
-            { "flags": 4, "matrix": [4, 3], "x": 47, "y": 64 },
-            { "flags": 2, "x": 39, "y": 64 },
-            { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 },
-
-            { "flags": 4, "matrix": [4, 1], "x": 12, "y": 64 },
-            { "flags": 2, "x": 6, "y": 64 },
-            { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 },
-
-            { "flags": 4, "matrix": [3, 0], "x": 0, "y": 52 },
-            { "flags": 4, "matrix": [3, 1], "x": 12, "y": 52 },
-            { "flags": 4, "matrix": [2, 1], "x": 12, "y": 40 },
-            { "flags": 4, "matrix": [2, 0], "x": 0, "y": 40 },
-            { "flags": 4, "matrix": [1, 0], "x": 0, "y": 27 },
-            { "flags": 4, "matrix": [1, 1], "x": 12, "y": 27 },
-            { "flags": 4, "matrix": [0, 1], "x": 12, "y": 15 },
-            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 15 },
-            { "flags": 4, "matrix": [5, 0], "x": 0, "y": 0 },
-            { "flags": 2, "x": 9, "y": 0 },
-
-            { "flags": 2, "x": 224, "y": 6 },
-            { "flags": 4, "matrix": [11, 8], "x": 224, "y": 0 },
-            { "flags": 4, "matrix": [11, 7], "x": 212, "y": 0 },
-            { "flags": 4, "matrix": [11, 6], "x": 197, "y": 0 },
-            { "flags": 2, "x": 191, "y": 6 },
-            { "flags": 4, "matrix": [11, 5], "x": 185, "y": 0 },
-            { "flags": 4, "matrix": [11, 4], "x": 173, "y": 0 },
-            { "flags": 2, "x": 166, "y": 6 },
-            { "flags": 4, "matrix": [11, 3], "x": 160, "y": 0 },
-            { "flags": 4, "matrix": [11, 2], "x": 145, "y": 0 },
-            { "flags": 2, "x": 139, "y": 6 },
-            { "flags": 4, "matrix": [11, 1], "x": 133, "y": 0 },
-
-            { "flags": 4, "matrix": [6, 0], "x": 127, "y": 15 },
-            { "flags": 4, "matrix": [6, 1], "x": 139, "y": 15 },
-            { "flags": 4, "matrix": [6, 2], "x": 151, "y": 15 },
-            { "flags": 4, "matrix": [6, 3], "x": 163, "y": 15 },
-            { "flags": 4, "matrix": [6, 4], "x": 176, "y": 15 },
-            { "flags": 4, "matrix": [6, 5], "x": 188, "y": 15 },
-            { "flags": 4, "matrix": [6, 6], "x": 200, "y": 15 },
-            { "flags": 4, "matrix": [6, 7], "x": 212, "y": 15 },
-            { "flags": 4, "matrix": [6, 8], "x": 224, "y": 15 },
-
-            { "flags": 4, "matrix": [7, 8], "x": 224, "y": 27 },
-            { "flags": 4, "matrix": [7, 7], "x": 209, "y": 27 },
-            { "flags": 4, "matrix": [7, 6], "x": 194, "y": 27 },
-            { "flags": 4, "matrix": [7, 5], "x": 182, "y": 27 },
-            { "flags": 4, "matrix": [7, 4], "x": 170, "y": 27 },
-            { "flags": 4, "matrix": [7, 3], "x": 157, "y": 27 },
-            { "flags": 4, "matrix": [7, 2], "x": 145, "y": 27 },
-            { "flags": 4, "matrix": [7, 1], "x": 133, "y": 27 },
-            { "flags": 4, "matrix": [7, 0], "x": 121, "y": 27 },
-
-            { "flags": 4, "matrix": [8, 0], "x": 124, "y": 40 },
-            { "flags": 4, "matrix": [8, 1], "x": 136, "y": 40 },
-            { "flags": 4, "matrix": [8, 2], "x": 148, "y": 40 },
-            { "flags": 4, "matrix": [8, 3], "x": 160, "y": 40 },
-            { "flags": 4, "matrix": [8, 4], "x": 173, "y": 40 },
-            { "flags": 4, "matrix": [8, 5], "x": 185, "y": 40 },
-            { "flags": 4, "matrix": [8, 7], "x": 204, "y": 40 },
-            { "flags": 4, "matrix": [8, 8], "x": 224, "y": 40 },
-
-            { "flags": 4, "matrix": [9, 8], "x": 224, "y": 52 },
-            { "flags": 4, "matrix": [9, 7], "x": 212, "y": 52 },
-            { "flags": 4, "matrix": [9, 6], "x": 195, "y": 52 },
-            { "flags": 4, "matrix": [9, 4], "x": 179, "y": 52 },
-            { "flags": 4, "matrix": [9, 3], "x": 166, "y": 52 },
-            { "flags": 4, "matrix": [9, 2], "x": 154, "y": 52 },
-            { "flags": 4, "matrix": [9, 1], "x": 142, "y": 52 },
-            { "flags": 4, "matrix": [9, 0], "x": 130, "y": 52 },
-
-            { "flags": 2, "x": 133, "y": 64 },
-            { "flags": 4, "matrix": [10, 1], "x": 141, "y": 64 },
-            { "flags": 2, "x": 160, "y": 64 },
-            { "flags": 4, "matrix": [10, 2], "x": 163, "y": 64 },
-            { "flags": 4, "matrix": [10, 3], "x": 176, "y": 64 },
-            { "flags": 4, "matrix": [10, 4], "x": 188, "y": 64 },
-            { "flags": 2, "x": 194, "y": 64 },
-            { "flags": 4, "matrix": [10, 6], "x": 200, "y": 64 },
-            { "flags": 4, "matrix": [10, 7], "x": 212, "y": 64 },
-            { "flags": 4, "matrix": [10, 8], "x": 224, "y": 64 },
-            { "flags": 2, "x": 224, "y": 55 }
+            {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
+            {"flags": 2, "x": 42, "y": 6},
+            {"flags": 4, "matrix": [5, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [5, 4], "x": 58, "y": 0},
+            {"flags": 2, "x": 67, "y": 6},
+            {"flags": 4, "matrix": [5, 5], "x": 70, "y": 0},
+            {"flags": 4, "matrix": [5, 6], "x": 82, "y": 0},
+            {"flags": 4, "matrix": [5, 7], "x": 97, "y": 0},
+            {"flags": 2, "x": 103, "y": 6},
+            {"flags": 4, "matrix": [5, 8], "x": 109, "y": 0},
+
+            {"flags": 4, "matrix": [0, 8], "x": 103, "y": 15},
+            {"flags": 4, "matrix": [0, 7], "x": 91, "y": 15},
+            {"flags": 4, "matrix": [0, 6], "x": 79, "y": 15},
+            {"flags": 4, "matrix": [0, 5], "x": 67, "y": 15},
+            {"flags": 4, "matrix": [0, 4], "x": 54, "y": 15},
+            {"flags": 4, "matrix": [0, 3], "x": 42, "y": 15},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 15},
+
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 27},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 27},
+            {"flags": 4, "matrix": [1, 4], "x": 61, "y": 27},
+            {"flags": 4, "matrix": [1, 5], "x": 73, "y": 27},
+            {"flags": 4, "matrix": [1, 6], "x": 85, "y": 27},
+            {"flags": 4, "matrix": [1, 7], "x": 97, "y": 27},
+
+            {"flags": 4, "matrix": [2, 7], "x": 100, "y": 40},
+            {"flags": 4, "matrix": [2, 6], "x": 88, "y": 40},
+            {"flags": 4, "matrix": [2, 5], "x": 76, "y": 40},
+            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 40},
+            {"flags": 4, "matrix": [2, 3], "x": 51, "y": 40},
+            {"flags": 4, "matrix": [2, 2], "x": 35, "y": 40},
+
+            {"flags": 4, "matrix": [3, 2], "x": 38, "y": 52},
+            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 52},
+            {"flags": 4, "matrix": [3, 5], "x": 70, "y": 52},
+            {"flags": 4, "matrix": [3, 6], "x": 82, "y": 52},
+            {"flags": 4, "matrix": [3, 7], "x": 94, "y": 52},
+            {"flags": 4, "matrix": [3, 8], "x": 106, "y": 52},
+
+            {"flags": 2, "x": 106, "y": 64},
+            {"flags": 4, "matrix": [4, 7], "x": 98, "y": 64},
+            {"flags": 4, "matrix": [4, 5], "x": 77, "y": 64},
+            {"flags": 2, "x": 67, "y": 64},
+            {"flags": 4, "matrix": [4, 4], "x": 62, "y": 64},
+            {"flags": 4, "matrix": [4, 3], "x": 47, "y": 64},
+            {"flags": 2, "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 64},
+
+            {"flags": 4, "matrix": [4, 1], "x": 12, "y": 64},
+            {"flags": 2, "x": 6, "y": 64},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 64},
+
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 52},
+            {"flags": 4, "matrix": [3, 1], "x": 12, "y": 52},
+            {"flags": 4, "matrix": [2, 1], "x": 12, "y": 40},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 27},
+            {"flags": 4, "matrix": [1, 1], "x": 12, "y": 27},
+            {"flags": 4, "matrix": [0, 1], "x": 12, "y": 15},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 15},
+            {"flags": 4, "matrix": [5, 0], "x": 0, "y": 0},
+            {"flags": 2, "x": 9, "y": 0},
+
+            {"flags": 2, "x": 224, "y": 6},
+            {"flags": 4, "matrix": [11, 8], "x": 224, "y": 0},
+            {"flags": 4, "matrix": [11, 7], "x": 212, "y": 0},
+            {"flags": 4, "matrix": [11, 6], "x": 197, "y": 0},
+            {"flags": 2, "x": 191, "y": 6},
+            {"flags": 4, "matrix": [11, 5], "x": 185, "y": 0},
+            {"flags": 4, "matrix": [11, 4], "x": 173, "y": 0},
+            {"flags": 2, "x": 166, "y": 6},
+            {"flags": 4, "matrix": [11, 3], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [11, 2], "x": 145, "y": 0},
+            {"flags": 2, "x": 139, "y": 6},
+            {"flags": 4, "matrix": [11, 1], "x": 133, "y": 0},
+
+            {"flags": 4, "matrix": [6, 0], "x": 127, "y": 15},
+            {"flags": 4, "matrix": [6, 1], "x": 139, "y": 15},
+            {"flags": 4, "matrix": [6, 2], "x": 151, "y": 15},
+            {"flags": 4, "matrix": [6, 3], "x": 163, "y": 15},
+            {"flags": 4, "matrix": [6, 4], "x": 176, "y": 15},
+            {"flags": 4, "matrix": [6, 5], "x": 188, "y": 15},
+            {"flags": 4, "matrix": [6, 6], "x": 200, "y": 15},
+            {"flags": 4, "matrix": [6, 7], "x": 212, "y": 15},
+            {"flags": 4, "matrix": [6, 8], "x": 224, "y": 15},
+
+            {"flags": 4, "matrix": [7, 8], "x": 224, "y": 27},
+            {"flags": 4, "matrix": [7, 7], "x": 209, "y": 27},
+            {"flags": 4, "matrix": [7, 6], "x": 194, "y": 27},
+            {"flags": 4, "matrix": [7, 5], "x": 182, "y": 27},
+            {"flags": 4, "matrix": [7, 4], "x": 170, "y": 27},
+            {"flags": 4, "matrix": [7, 3], "x": 157, "y": 27},
+            {"flags": 4, "matrix": [7, 2], "x": 145, "y": 27},
+            {"flags": 4, "matrix": [7, 1], "x": 133, "y": 27},
+            {"flags": 4, "matrix": [7, 0], "x": 121, "y": 27},
+
+            {"flags": 4, "matrix": [8, 0], "x": 124, "y": 40},
+            {"flags": 4, "matrix": [8, 1], "x": 136, "y": 40},
+            {"flags": 4, "matrix": [8, 2], "x": 148, "y": 40},
+            {"flags": 4, "matrix": [8, 3], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [8, 4], "x": 173, "y": 40},
+            {"flags": 4, "matrix": [8, 5], "x": 185, "y": 40},
+            {"flags": 4, "matrix": [8, 7], "x": 204, "y": 40},
+            {"flags": 4, "matrix": [8, 8], "x": 224, "y": 40},
+
+            {"flags": 4, "matrix": [9, 8], "x": 224, "y": 52},
+            {"flags": 4, "matrix": [9, 7], "x": 212, "y": 52},
+            {"flags": 4, "matrix": [9, 6], "x": 195, "y": 52},
+            {"flags": 4, "matrix": [9, 4], "x": 179, "y": 52},
+            {"flags": 4, "matrix": [9, 3], "x": 166, "y": 52},
+            {"flags": 4, "matrix": [9, 2], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [9, 1], "x": 142, "y": 52},
+            {"flags": 4, "matrix": [9, 0], "x": 130, "y": 52},
+
+            {"flags": 2, "x": 133, "y": 64},
+            {"flags": 4, "matrix": [10, 1], "x": 141, "y": 64},
+            {"flags": 2, "x": 160, "y": 64},
+            {"flags": 4, "matrix": [10, 2], "x": 163, "y": 64},
+            {"flags": 4, "matrix": [10, 3], "x": 176, "y": 64},
+            {"flags": 4, "matrix": [10, 4], "x": 188, "y": 64},
+            {"flags": 2, "x": 194, "y": 64},
+            {"flags": 4, "matrix": [10, 6], "x": 200, "y": 64},
+            {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
+            {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
+            {"flags": 2, "x": 224, "y": 55}
           ]
     },
     "layouts": {
diff --git a/keyboards/keebio/tukey/info.json b/keyboards/keebio/tukey/info.json
index 47908438ed..3c4951b407 100644
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -21,8 +21,8 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {"x":0, "y":0, "matrix": [0, 0]},
-          {"x":1, "y":0, "matrix": [0, 1]}
+          {"x": 0, "y": 0, "matrix": [0, 0]},
+          {"x": 1, "y": 0, "matrix": [0, 1]}
         ]
       }
     }
diff --git a/keyboards/keebsforall/coarse60/info.json b/keyboards/keebsforall/coarse60/info.json
index ce1ab219bb..11ec69872f 100644
--- a/keyboards/keebsforall/coarse60/info.json
+++ b/keyboards/keebsforall/coarse60/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "coarse60",
     "manufacturer": "KeebsForAll",
-    "url":"https://keebsforall.com",
+    "url": "https://keebsforall.com",
     "maintainer": "keebsforall",
     "usb": {
         "vid": "0x6B66",
diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/info.json
index 1d02e00a7a..1e92ad7063 100644
--- a/keyboards/keebsforall/freebird75/info.json
+++ b/keyboards/keebsforall/freebird75/info.json
@@ -26,436 +26,90 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "matrix": [0, 0],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 1],
-                    "x": 1.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 2],
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 3],
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 4],
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 5],
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 6],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 7],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 8],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 9],
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 10],
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 11],
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 12],
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 13],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [0, 14],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [1, 0],
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 1],
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 2],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 3],
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 4],
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 5],
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 6],
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 7],
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 8],
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 9],
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 10],
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 11],
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 12],
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 13],
-                    "x": 13,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [4, 14],
-                    "x": 14,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [1, 14],
-                    "x": 15.25,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [2, 0],
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [2, 1],
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 2],
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 3],
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 4],
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 5],
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 6],
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 7],
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 8],
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 9],
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 10],
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 11],
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 12],
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [2, 13],
-                    "x": 13.5,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [2, 14],
-                    "x": 15.25,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [3, 0],
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [3, 1],
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 2],
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 3],
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 4],
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 5],
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 6],
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 7],
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 8],
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 9],
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 10],
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 11],
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [3, 13],
-                    "x": 12.75,
-                    "y": 3.25,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [3, 14],
-                    "x": 15.25,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [4, 0],
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [4, 1],
-                    "x": 1.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 2],
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 3],
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 4],
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 5],
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 6],
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 7],
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 8],
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 9],
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 10],
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 11],
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [4, 12],
-                    "x": 12.25,
-                    "y": 4.25,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [4, 13],
-                    "x": 14.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [5, 0],
-                    "x": 0,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [5, 1],
-                    "x": 1.25,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [5, 2],
-                    "x": 2.5,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [5, 6],
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "matrix": [5, 9],
-                    "x": 10,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 10],
-                    "x": 11,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 11],
-                    "x": 12,
-                    "y": 5.25
-                },
-                {
-                    "matrix": [5, 12],
-                    "x": 13.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [5, 13],
-                    "x": 14.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [5, 14],
-                    "x": 15.25,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25},
+                {"matrix": [4, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25},
+                {"matrix": [5, 10], "x": 11, "y": 5.25},
+                {"matrix": [5, 11], "x": 12, "y": 5.25},
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/info.json
index fe541e634a..1ac13e81f8 100644
--- a/keyboards/kepler_33/proto/info.json
+++ b/keyboards/kepler_33/proto/info.json
@@ -30,57 +30,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"Q", "x":1, "y":0},
-                {"matrix": [0, 2], "label":"W", "x":2, "y":0},
-                {"matrix": [0, 3], "label":"E", "x":3, "y":0},
-                {"matrix": [0, 4], "label":"R", "x":4, "y":0},
-                {"matrix": [0, 5], "label":"T", "x":5, "y":0},
-                {"matrix": [0, 6], "label":"Y", "x":6, "y":0},
-                {"matrix": [0, 8], "label":"U", "x":7, "y":0},
-                {"matrix": [0, 9], "label":"I", "x":8, "y":0},
-                {"matrix": [0, 10], "label":"O", "x":9, "y":0},
-                {"matrix": [0, 11], "label":"P", "x":10, "y":0},
-                {"matrix": [0, 12], "label":"[{", "x":11, "y":0},
-                {"matrix": [0, 13], "label":"]}", "x":12, "y":0},
-                {"matrix": [0, 14], "label":"Del", "x":13, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 8], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 9], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 10], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 11], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 12], "label": "[{", "x": 11, "y": 0},
+                {"matrix": [0, 13], "label": "]}", "x": 12, "y": 0},
+                {"matrix": [0, 14], "label": "Del", "x": 13, "y": 0},
 
-                {"matrix": [1, 0], "label":"Layer", "x":0.25, "y":1},
-                {"matrix": [1, 1], "label":"A", "x":1.5, "y":1},
-                {"matrix": [1, 2], "label":"S", "x":2.5, "y":1},
-                {"matrix": [1, 3], "label":"D", "x":3.5, "y":1},
-                {"matrix": [1, 4], "label":"F", "x":4.5, "y":1},
-                {"matrix": [1, 5], "label":"G", "x":5.5, "y":1},
-                {"matrix": [1, 7], "label":"H", "x":6.5, "y":1},
-                {"matrix": [1, 9], "label":"J", "x":7.5, "y":1},
-                {"matrix": [1, 10], "label":"K", "x":8.5, "y":1},
-                {"matrix": [1, 11], "label":"L", "x":9.5, "y":1},
-                {"matrix": [1, 12], "label":";:", "x":10.5, "y":1},
-                {"matrix": [1, 13], "label":"'\"", "x":11.5, "y":1},
-                {"matrix": [1, 14], "label":"Enter", "x":12.75, "y":1},
+                {"matrix": [1, 0], "label": "Layer", "x": 0.25, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "label": "H", "x": 6.5, "y": 1},
+                {"matrix": [1, 9], "label": "J", "x": 7.5, "y": 1},
+                {"matrix": [1, 10], "label": "K", "x": 8.5, "y": 1},
+                {"matrix": [1, 11], "label": "L", "x": 9.5, "y": 1},
+                {"matrix": [1, 12], "label": ";:", "x": 10.5, "y": 1},
+                {"matrix": [1, 13], "label": "'\"", "x": 11.5, "y": 1},
+                {"matrix": [1, 14], "label": "Enter", "x": 12.75, "y": 1},
 
-                {"matrix": [2, 0], "label":"Shift_L", "x":0.5, "y":2},
-                {"matrix": [2, 1], "label":"Z", "x":2, "y":2},
-                {"matrix": [2, 2], "label":"X", "x":3, "y":2},
-                {"matrix": [2, 3], "label":"C", "x":4, "y":2},
-                {"matrix": [2, 4], "label":"V", "x":5, "y":2},
-                {"matrix": [2, 6], "label":"B", "x":6, "y":2},
-                {"matrix": [2, 8], "label":"N", "x":7, "y":2},
-                {"matrix": [2, 10], "label":"M", "x":8, "y":2},
-                {"matrix": [2, 11], "label":",<", "x":9, "y":2},
-                {"matrix": [2, 12], "label":".>", "x":10, "y":2},
-                {"matrix": [2, 13], "label":"/?", "x":11, "y":2},
-                {"matrix": [2, 14], "label":"BackS", "x":12.5, "y":2},
+                {"matrix": [2, 0], "label": "Shift_L", "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 2, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 3, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 4, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "B", "x": 6, "y": 2},
+                {"matrix": [2, 8], "label": "N", "x": 7, "y": 2},
+                {"matrix": [2, 10], "label": "M", "x": 8, "y": 2},
+                {"matrix": [2, 11], "label": ",<", "x": 9, "y": 2},
+                {"matrix": [2, 12], "label": ".>", "x": 10, "y": 2},
+                {"matrix": [2, 13], "label": "/?", "x": 11, "y": 2},
+                {"matrix": [2, 14], "label": "BackS", "x": 12.5, "y": 2},
 
-                {"matrix": [3, 0], "label":"Ctrl_L", "x":0, "y":3},
-                {"matrix": [3, 1], "label":"FN_L", "x":1.25, "y":3},
-                {"matrix": [3, 2], "label":"Alt_L", "x":2.5, "y":3},
-                {"matrix": [3, 4], "label":"Space", "x":5, "y":3},
-                {"matrix": [3, 7], "label":"Space", "x":6.5, "y":3},
-                {"matrix": [3, 10], "label":"Menu", "x":8, "y":3},
-                {"matrix": [3, 12], "label":"Alt_R", "x":10.5, "y":3},
-                {"matrix": [3, 13], "label":"FN_R", "x":11.75, "y":3},
-                {"matrix": [3, 14], "label":"Ctrl_R", "x":13, "y":3}
+                {"matrix": [3, 0], "label": "Ctrl_L", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "FN_L", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt_L", "x": 2.5, "y": 3},
+                {"matrix": [3, 4], "label": "Space", "x": 5, "y": 3},
+                {"matrix": [3, 7], "label": "Space", "x": 6.5, "y": 3},
+                {"matrix": [3, 10], "label": "Menu", "x": 8, "y": 3},
+                {"matrix": [3, 12], "label": "Alt_R", "x": 10.5, "y": 3},
+                {"matrix": [3, 13], "label": "FN_R", "x": 11.75, "y": 3},
+                {"matrix": [3, 14], "label": "Ctrl_R", "x": 13, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json
index 38ea8592aa..bb901c4220 100644
--- a/keyboards/keychron/q0/rev_0130/info.json
+++ b/keyboards/keychron/q0/rev_0130/info.json
@@ -55,63 +55,63 @@
         },
         "center_point": [56, 16],
         "layout": [
-            {"flags": 1, "matrix":[0, 0], "x":0, "y":0},
-            {"flags": 1, "matrix":[0, 1], "x":37, "y":0},
-            {"flags": 1, "matrix":[0, 2], "x":75, "y":0},
-            {"flags": 1, "matrix":[0, 3], "x":112, "y":0},
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 1, "matrix": [0, 1], "x": 37, "y": 0},
+            {"flags": 1, "matrix": [0, 2], "x": 75, "y": 0},
+            {"flags": 1, "matrix": [0, 3], "x": 112, "y": 0},
 
-            {"flags": 9, "matrix":[1, 0], "x":0, "y":6},
-            {"flags": 4, "matrix":[1, 1], "x":37, "y":6},
-            {"flags": 4, "matrix":[1, 2], "x":75, "y":6},
-            {"flags": 4, "matrix":[1, 3], "x":112, "y":6},
+            {"flags": 9, "matrix": [1, 0], "x": 0, "y": 6},
+            {"flags": 4, "matrix": [1, 1], "x": 37, "y": 6},
+            {"flags": 4, "matrix": [1, 2], "x": 75, "y": 6},
+            {"flags": 4, "matrix": [1, 3], "x": 112, "y": 6},
 
-            {"flags": 4, "matrix":[2, 0], "x":0, "y":13},
-            {"flags": 4, "matrix":[2, 1], "x":37, "y":13},
-            {"flags": 4, "matrix":[2, 2], "x":75, "y":13},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 13},
+            {"flags": 4, "matrix": [2, 1], "x": 37, "y": 13},
+            {"flags": 4, "matrix": [2, 2], "x": 75, "y": 13},
 
-            {"flags": 4, "matrix":[3, 0], "x":0, "y":19},
-            {"flags": 4, "matrix":[3, 1], "x":37, "y":19},
-            {"flags": 4, "matrix":[3, 2], "x":75, "y":19},
-            {"flags": 4, "matrix":[2, 3], "x":112, "y":16},
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 19},
+            {"flags": 4, "matrix": [3, 1], "x": 37, "y": 19},
+            {"flags": 4, "matrix": [3, 2], "x": 75, "y": 19},
+            {"flags": 4, "matrix": [2, 3], "x": 112, "y": 16},
 
-            {"flags": 4, "matrix":[4, 0], "x":0, "y":25},
-            {"flags": 4, "matrix":[4, 1], "x":37, "y":25},
-            {"flags": 4, "matrix":[4, 2], "x":75, "y":25},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 25},
+            {"flags": 4, "matrix": [4, 1], "x": 37, "y": 25},
+            {"flags": 4, "matrix": [4, 2], "x": 75, "y": 25},
 
-            {"flags": 4, "matrix":[5, 0], "x":18, "y":32},
-            {"flags": 4, "matrix":[5, 2], "x":75, "y":32},
-            {"flags": 1, "matrix":[4, 3], "x":112, "y":29}
+            {"flags": 4, "matrix": [5, 0], "x": 18, "y": 32},
+            {"flags": 4, "matrix": [5, 2], "x": 75, "y": 32},
+            {"flags": 1, "matrix": [4, 3], "x": 112, "y": 29}
         ]
     },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2},
-                {"matrix":[2, 1], "x":1, "y":2},
-                {"matrix":[2, 2], "x":2, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3},
-                {"matrix":[3, 1], "x":1, "y":3},
-                {"matrix":[3, 2], "x":2, "y":3},
-                {"matrix":[2, 3], "x":3, "y":2, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4},
-                {"matrix":[4, 1], "x":1, "y":4},
-                {"matrix":[4, 2], "x":2, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
 
-                {"matrix":[5, 0], "x":0, "y":5, "w":2},
-                {"matrix":[5, 2], "x":2, "y":5},
-                {"matrix":[4, 3], "x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
index 8736a937d5..5f8d6219de 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -63,74 +63,74 @@
             "solid_splash": true
         },
         "layout": [
-            {"flags": 1, "matrix":[0, 1], "x":56, "y":0},
-            {"flags": 1, "matrix":[0, 2], "x":112, "y":0},
-            {"flags": 1, "matrix":[0, 3], "x":168, "y":0},
-            {"flags": 1, "matrix":[0, 4], "x":224, "y":0},
+            {"flags": 1, "matrix": [0, 1], "x": 56, "y": 0},
+            {"flags": 1, "matrix": [0, 2], "x": 112, "y": 0},
+            {"flags": 1, "matrix": [0, 3], "x": 168, "y": 0},
+            {"flags": 1, "matrix": [0, 4], "x": 224, "y": 0},
 
-            {"flags": 4, "matrix":[1, 0], "x":0, "y":15},
-            {"flags": 8, "matrix":[1, 1], "x":56, "y":15},
-            {"flags": 4, "matrix":[1, 2], "x":112, "y":15},
-            {"flags": 4, "matrix":[1, 3], "x":168, "y":15},
-            {"flags": 4, "matrix":[1, 4], "x":224, "y":15},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 15},
+            {"flags": 8, "matrix": [1, 1], "x": 56, "y": 15},
+            {"flags": 4, "matrix": [1, 2], "x": 112, "y": 15},
+            {"flags": 4, "matrix": [1, 3], "x": 168, "y": 15},
+            {"flags": 4, "matrix": [1, 4], "x": 224, "y": 15},
 
-            {"flags": 4, "matrix":[2, 0], "x":0, "y":27},
-            {"flags": 4, "matrix":[2, 1], "x":56, "y":27},
-            {"flags": 4, "matrix":[2, 2], "x":112, "y":27},
-            {"flags": 4, "matrix":[2, 3], "x":168, "y":27},
-            {"flags": 4, "matrix":[2, 4], "x":224, "y":34},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 27},
+            {"flags": 4, "matrix": [2, 1], "x": 56, "y": 27},
+            {"flags": 4, "matrix": [2, 2], "x": 112, "y": 27},
+            {"flags": 4, "matrix": [2, 3], "x": 168, "y": 27},
+            {"flags": 4, "matrix": [2, 4], "x": 224, "y": 34},
 
-            {"flags": 4, "matrix":[3, 0], "x":0, "y":40},
-            {"flags": 4, "matrix":[3, 1], "x":56, "y":40},
-            {"flags": 4, "matrix":[3, 2], "x":112, "y":40},
-            {"flags": 4, "matrix":[3, 3], "x":168, "y":40},
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [3, 1], "x": 56, "y": 40},
+            {"flags": 4, "matrix": [3, 2], "x": 112, "y": 40},
+            {"flags": 4, "matrix": [3, 3], "x": 168, "y": 40},
 
-            {"flags": 4, "matrix":[4, 0], "x":0, "y":52},
-            {"flags": 4, "matrix":[4, 1], "x":56, "y":52},
-            {"flags": 4, "matrix":[4, 2], "x":112, "y":52},
-            {"flags": 4, "matrix":[4, 3], "x":168, "y":52},
-            {"flags": 4, "matrix":[4, 4], "x":224, "y":58},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 52},
+            {"flags": 4, "matrix": [4, 1], "x": 56, "y": 52},
+            {"flags": 4, "matrix": [4, 2], "x": 112, "y": 52},
+            {"flags": 4, "matrix": [4, 3], "x": 168, "y": 52},
+            {"flags": 4, "matrix": [4, 4], "x": 224, "y": 58},
 
-            {"flags": 4, "matrix":[5, 0], "x":0, "y":64},
-            {"flags": 4, "matrix":[5, 1], "x":84, "y":64},
-            {"flags": 1, "matrix":[5, 3], "x":168, "y":64}
+            {"flags": 4, "matrix": [5, 0], "x": 0, "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 84, "y": 64},
+            {"flags": 1, "matrix": [5, 3], "x": 168, "y": 64}
         ]
     },
     "layouts": {
         "LAYOUT_numpad_6x5": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix": [0, 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":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1.25, "y":1.25},
-                {"matrix":[1, 2], "x":2.25, "y":1.25},
-                {"matrix":[1, 3], "x":3.25, "y":1.25},
-                {"matrix":[1, 4], "x":4.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
 
-                {"matrix":[2, 0], "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},
-                {"matrix":[2, 4], "x":4.25, "y":2.25, "h":2},
+                {"matrix": [2, 0], "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},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25, "h": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
 
-                {"matrix":[4, 0], "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},
-                {"matrix":[4, 4], "x":4.25, "y":4.25, "h":2},
+                {"matrix": [4, 0], "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},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25, "h": 2},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":2},
-                {"matrix":[5, 3], "x":3.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 2},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index e41ab1086a..b48eaee03e 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -22,93 +22,93 @@
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":1.25, "y":0},
-                {"matrix":[0, 3], "x":2.25, "y":0},
-                {"matrix":[0, 4], "x":3.25, "y":0},
-                {"matrix":[0, 5], "x":4.25, "y":0},
-                {"matrix":[0, 6], "x":5.5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.75, "y":0},
-                {"matrix":[0, 11], "x":10.75, "y":0},
-                {"matrix":[0, 12], "x":11.75, "y":0},
-                {"matrix":[0, 13], "x":12.75, "y":0},
-                {"matrix":[4, 14], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1, 10], "x":10, "y":1},
-                {"matrix":[1, 11], "x":11, "y":1},
-                {"matrix":[1, 12], "x":12, "y":1},
-                {"matrix":[1, 13], "x":13, "y":1, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2, 10], "x":10.5, "y":2},
-                {"matrix":[2, 11], "x":11.5, "y":2},
-                {"matrix":[2, 12], "x":12.5, "y":2},
-                {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "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, 13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3, 14], "x":15.25, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4, 10], "x":10.25, "y":4},
-                {"matrix":[4, 11], "x":11.25, "y":4},
-                {"matrix":[4, 13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[3, 12], "x":14.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5},
-                {"matrix":[5, 11], "x":11, "y":5},
-                {"matrix":[5, 12], "x":12, "y":5},
-                {"matrix":[5, 13], "x":13.25, "y":5.25},
-                {"matrix":[4, 12], "x":14.25, "y":5.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index 3946625f3c..f520724989 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -27,93 +27,93 @@
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":1.25, "y":0},
-                {"matrix":[0, 3], "x":2.25, "y":0},
-                {"matrix":[0, 4], "x":3.25, "y":0},
-                {"matrix":[0, 5], "x":4.25, "y":0},
-                {"matrix":[0, 6], "x":5.5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.75, "y":0},
-                {"matrix":[0, 11], "x":10.75, "y":0},
-                {"matrix":[0, 12], "x":11.75, "y":0},
-                {"matrix":[0, 13], "x":12.75, "y":0},
-                {"matrix":[4, 14], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1, 10], "x":10, "y":1},
-                {"matrix":[1, 11], "x":11, "y":1},
-                {"matrix":[1, 12], "x":12, "y":1},
-                {"matrix":[1, 13], "x":13, "y":1, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2, 10], "x":10.5, "y":2},
-                {"matrix":[2, 11], "x":11.5, "y":2},
-                {"matrix":[2, 12], "x":12.5, "y":2},
-                {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "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, 13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3, 14], "x":15.25, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15.25, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4, 10], "x":10.25, "y":4},
-                {"matrix":[4, 11], "x":11.25, "y":4},
-                {"matrix":[4, 13], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[3, 12], "x":14.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5},
-                {"matrix":[5, 11], "x":11, "y":5},
-                {"matrix":[5, 12], "x":12, "y":5},
-                {"matrix":[5, 13], "x":13.25, "y":5.25},
-                {"matrix":[4, 12], "x":14.25, "y":5.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5},
+                {"matrix": [5, 11], "x": 11, "y": 5},
+                {"matrix": [5, 12], "x": 12, "y": 5},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index 28a3e38c77..9caf6d6183 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -22,94 +22,94 @@
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":1.25, "y":0},
-                {"matrix":[0, 3], "x":2.25, "y":0},
-                {"matrix":[0, 4], "x":3.25, "y":0},
-                {"matrix":[0, 5], "x":4.25, "y":0},
-                {"matrix":[0, 6], "x":5.5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.75, "y":0},
-                {"matrix":[0, 11], "x":10.75, "y":0},
-                {"matrix":[0, 12], "x":11.75, "y":0},
-                {"matrix":[0, 13], "x":12.75, "y":0},
-                {"matrix":[4, 14], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 14], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[3, 12], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[4, 12], "x":14.25, "y":5.5},
-                {"matrix":[5, 14], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index d8e1751de3..a3aba1aed3 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -27,94 +27,94 @@
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":1.25, "y":0},
-                {"matrix":[0, 3], "x":2.25, "y":0},
-                {"matrix":[0, 4], "x":3.25, "y":0},
-                {"matrix":[0, 5], "x":4.25, "y":0},
-                {"matrix":[0, 6], "x":5.5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.75, "y":0},
-                {"matrix":[0, 11], "x":10.75, "y":0},
-                {"matrix":[0, 12], "x":11.75, "y":0},
-                {"matrix":[0, 13], "x":12.75, "y":0},
-                {"matrix":[4, 14], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1.25, "y": 0},
+                {"matrix": [0, 3], "x": 2.25, "y": 0},
+                {"matrix": [0, 4], "x": 3.25, "y": 0},
+                {"matrix": [0, 5], "x": 4.25, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.75, "y": 0},
+                {"matrix": [0, 11], "x": 10.75, "y": 0},
+                {"matrix": [0, 12], "x": 11.75, "y": 0},
+                {"matrix": [0, 13], "x": 12.75, "y": 0},
+                {"matrix": [4, 14], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 14], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[3, 12], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [3, 12], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[4, 12], "x":14.25, "y":5.5},
-                {"matrix":[5, 14], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [4, 12], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index 5a14a6fb2b..6b44fdbfdb 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -24,100 +24,100 @@
     "layouts": {
         "LAYOUT_ansi_89": {
             "layout": [
-                {"matrix":[0, 0], "x":0.25, "y":0},
-                {"matrix":[0, 1], "x":1.75, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6, "y":0},
-                {"matrix":[0, 6], "x":7.25, "y":0},
-                {"matrix":[0, 7], "x":8.25, "y":0},
-                {"matrix":[0, 8], "x":11, "y":0},
-                {"matrix":[0, 9], "x":12, "y":0},
-                {"matrix":[0, 10], "x":13.25, "y":0},
-                {"matrix":[0, 11], "x":14.25, "y":0},
-                {"matrix":[0, 12], "x":15.25, "y":0},
-                {"matrix":[0, 13], "x":16.25, "y":0},
-                {"matrix":[0, 14], "x":17.5, "y":0},
-                {"matrix":[0, 15], "x":18.75, "y":0},
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
 
-                {"matrix":[1, 0], "x":0.75, "y":1.25},
-                {"matrix":[1, 1], "x":2.25, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":7.25, "y":1.25},
-                {"matrix":[1, 7], "x":8.25, "y":1.25},
-                {"matrix":[1, 8], "x":10.5, "y":1.25},
-                {"matrix":[1, 9], "x":11.5, "y":1.25},
-                {"matrix":[1, 10], "x":12.5, "y":1.25},
-                {"matrix":[1, 11], "x":13.5, "y":1.25},
-                {"matrix":[1, 12], "x":14.5, "y":1.25},
-                {"matrix":[1, 13], "x":15.5, "y":1.25},
-                {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":19, "y":1.25},
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0.5, "y":2.25},
-                {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
-                {"matrix":[2, 2], "x":3.25, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":7.5, "y":2.25},
-                {"matrix":[2, 7], "x":10, "y":2.25},
-                {"matrix":[2, 8], "x":11, "y":2.25},
-                {"matrix":[2, 9], "x":12, "y":2.25},
-                {"matrix":[2, 10], "x":13, "y":2.25},
-                {"matrix":[2, 11], "x":14, "y":2.25},
-                {"matrix":[2, 12], "x":15.25, "y":2.25},
-                {"matrix":[2, 13], "x":16.25, "y":2.25},
-                {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":19.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0.25, "y":3.25},
-                {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
-                {"matrix":[3, 2], "x":3.25, "y":3.25},
-                {"matrix":[3, 3], "x":4.5, "y":3.25},
-                {"matrix":[3, 4], "x":5.5, "y":3.25},
-                {"matrix":[3, 5], "x":6.5, "y":3.25},
-                {"matrix":[3, 6], "x":7.5, "y":3.25},
-                {"matrix":[3, 8], "x":10.25, "y":3.25},
-                {"matrix":[3, 9], "x":11.25, "y":3.25},
-                {"matrix":[3, 10], "x":12.25, "y":3.25},
-                {"matrix":[3, 11], "x":13.25, "y":3.25},
-                {"matrix":[3, 12], "x":14.75, "y":3.25},
-                {"matrix":[3, 13], "x":15.75, "y":3.25},
-                {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":19.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 4], "x":4.75, "y":4.25},
-                {"matrix":[4, 5], "x":5.75, "y":4.25},
-                {"matrix":[4, 6], "x":6.75, "y":4.25},
-                {"matrix":[4, 7], "x":7.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.5, "y":4.25},
-                {"matrix":[4, 9], "x":10.5, "y":4.25},
-                {"matrix":[4, 10], "x":11.5, "y":4.25},
-                {"matrix":[4, 11], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":13.5, "y":4.25},
-                {"matrix":[4, 13], "x":15.25, "y":4.25},
-                {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":18.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":4.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
-                {"matrix":[5, 7], "x":8.25, "y":5.25},
-                {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
-                {"matrix":[5, 9], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":17.25, "y":5.5},
-                {"matrix":[5, 14], "x":18.25, "y":5.5},
-                {"matrix":[5, 15], "x":19.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 19fd30e0f3..14910d2939 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -24,101 +24,101 @@
     "layouts": {
         "LAYOUT_iso_90": {
             "layout": [
-                {"matrix":[0, 0], "x":0.25, "y":0},
-                {"matrix":[0, 1], "x":1.75, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6, "y":0},
-                {"matrix":[0, 6], "x":7.25, "y":0},
-                {"matrix":[0, 7], "x":8.25, "y":0},
-                {"matrix":[0, 8], "x":11, "y":0},
-                {"matrix":[0, 9], "x":12, "y":0},
-                {"matrix":[0, 10], "x":13.25, "y":0},
-                {"matrix":[0, 11], "x":14.25, "y":0},
-                {"matrix":[0, 12], "x":15.25, "y":0},
-                {"matrix":[0, 13], "x":16.25, "y":0},
-                {"matrix":[0, 14], "x":17.5, "y":0},
-                {"matrix":[0, 15], "x":18.75, "y":0},
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
 
-                {"matrix":[1, 0], "x":0.75, "y":1.25},
-                {"matrix":[1, 1], "x":2.25, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":7.25, "y":1.25},
-                {"matrix":[1, 7], "x":8.25, "y":1.25},
-                {"matrix":[1, 8], "x":10.5, "y":1.25},
-                {"matrix":[1, 9], "x":11.5, "y":1.25},
-                {"matrix":[1, 10], "x":12.5, "y":1.25},
-                {"matrix":[1, 11], "x":13.5, "y":1.25},
-                {"matrix":[1, 12], "x":14.5, "y":1.25},
-                {"matrix":[1, 13], "x":15.5, "y":1.25},
-                {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":19, "y":1.25},
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0.5, "y":2.25},
-                {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
-                {"matrix":[2, 2], "x":3.25, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":7.5, "y":2.25},
-                {"matrix":[2, 7], "x":10, "y":2.25},
-                {"matrix":[2, 8], "x":11, "y":2.25},
-                {"matrix":[2, 9], "x":12, "y":2.25},
-                {"matrix":[2, 10], "x":13, "y":2.25},
-                {"matrix":[2, 11], "x":14, "y":2.25},
-                {"matrix":[2, 12], "x":15.25, "y":2.25},
-                {"matrix":[2, 13], "x":16.25, "y":2.25},
-                {"matrix":[2, 15], "x":19.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0.25, "y":3.25},
-                {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
-                {"matrix":[3, 2], "x":3.25, "y":3.25},
-                {"matrix":[3, 3], "x":4.5, "y":3.25},
-                {"matrix":[3, 4], "x":5.5, "y":3.25},
-                {"matrix":[3, 5], "x":6.5, "y":3.25},
-                {"matrix":[3, 6], "x":7.5, "y":3.25},
-                {"matrix":[3, 8], "x":10.25, "y":3.25},
-                {"matrix":[3, 9], "x":11.25, "y":3.25},
-                {"matrix":[3, 10], "x":12.25, "y":3.25},
-                {"matrix":[3, 11], "x":13.25, "y":3.25},
-                {"matrix":[3, 12], "x":14.75, "y":3.25},
-                {"matrix":[3, 13], "x":15.75, "y":3.25},
-                {"matrix":[3, 14], "x":16.75, "y":3.25},
-                {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":19.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 4], "x":4.75, "y":4.25},
-                {"matrix":[4, 5], "x":5.75, "y":4.25},
-                {"matrix":[4, 6], "x":6.75, "y":4.25},
-                {"matrix":[4, 7], "x":7.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.5, "y":4.25},
-                {"matrix":[4, 9], "x":10.5, "y":4.25},
-                {"matrix":[4, 10], "x":11.5, "y":4.25},
-                {"matrix":[4, 11], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":13.5, "y":4.25},
-                {"matrix":[4, 13], "x":15.25, "y":4.25},
-                {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":18.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":4.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
-                {"matrix":[5, 7], "x":8.25, "y":5.25},
-                {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
-                {"matrix":[5, 9], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":17.25, "y":5.5},
-                {"matrix":[5, 14], "x":18.25, "y":5.5},
-                {"matrix":[5, 15], "x":19.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/info.json
index d602ed5786..da10fe5166 100755
--- a/keyboards/keychron/q11/ansi_encoder/info.json
+++ b/keyboards/keychron/q11/ansi_encoder/info.json
@@ -64,102 +64,102 @@
     "layouts": {
         "LAYOUT_ansi_91": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.25, "y":0},
-                {"matrix":[0, 6], "x":6.25, "y":0},
-                {"matrix":[0, 7], "x":7.25, "y":0},
-                {"matrix":[6, 0], "x":8.25, "y":0},
-                {"matrix":[6, 1], "x":9.25, "y":0},
-                {"matrix":[6, 2], "x":10.25, "y":0},
-                {"matrix":[6, 3], "x":11.25, "y":0},
-                {"matrix":[6, 4], "x":12.25, "y":0},
-                {"matrix":[6, 5], "x":13.25, "y":0},
-                {"matrix":[6, 6], "x":14.25, "y":0},
-                {"matrix":[6, 7], "x":15.25, "y":0},
-                {"matrix":[6, 8], "x":16.5, "y":0},
+                {"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.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [6, 0], "x": 8.25, "y": 0},
+                {"matrix": [6, 1], "x": 9.25, "y": 0},
+                {"matrix": [6, 2], "x": 10.25, "y": 0},
+                {"matrix": [6, 3], "x": 11.25, "y": 0},
+                {"matrix": [6, 4], "x": 12.25, "y": 0},
+                {"matrix": [6, 5], "x": 13.25, "y": 0},
+                {"matrix": [6, 6], "x": 14.25, "y": 0},
+                {"matrix": [6, 7], "x": 15.25, "y": 0},
+                {"matrix": [6, 8], "x": 16.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1.25, "y":1.25},
-                {"matrix":[1, 2], "x":2.25, "y":1.25},
-                {"matrix":[1, 3], "x":3.25, "y":1.25},
-                {"matrix":[1, 4], "x":4.25, "y":1.25},
-                {"matrix":[1, 5], "x":5.25, "y":1.25},
-                {"matrix":[1, 6], "x":6.25, "y":1.25},
-                {"matrix":[1, 7], "x":7.25, "y":1.25},
-                {"matrix":[7, 0], "x":8.25, "y":1.25},
-                {"matrix":[7, 1], "x":9.25, "y":1.25},
-                {"matrix":[7, 2], "x":10.25, "y":1.25},
-                {"matrix":[7, 3], "x":11.25, "y":1.25},
-                {"matrix":[7, 4], "x":12.25, "y":1.25},
-                {"matrix":[7, 5], "x":13.25, "y":1.25},
-                {"matrix":[7, 6], "x":14.25, "y":1.25, "w":2},
-                {"matrix":[7, 8], "x":16.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [7, 0], "x": 8.25, "y": 1.25},
+                {"matrix": [7, 1], "x": 9.25, "y": 1.25},
+                {"matrix": [7, 2], "x": 10.25, "y": 1.25},
+                {"matrix": [7, 3], "x": 11.25, "y": 1.25},
+                {"matrix": [7, 4], "x": 12.25, "y": 1.25},
+                {"matrix": [7, 5], "x": 13.25, "y": 1.25},
+                {"matrix": [7, 6], "x": 14.25, "y": 1.25, "w": 2},
+                {"matrix": [7, 8], "x": 16.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25},
-                {"matrix":[2, 1], "x":1.25, "y":2.25, "w":1.5},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 6], "x":5.75, "y":2.25},
-                {"matrix":[2, 7], "x":6.75, "y":2.25},
-                {"matrix":[8, 0], "x":7.75, "y":2.25},
-                {"matrix":[8, 1], "x":8.75, "y":2.25},
-                {"matrix":[8, 2], "x":9.75, "y":2.25},
-                {"matrix":[8, 3], "x":10.75, "y":2.25},
-                {"matrix":[8, 4], "x":11.75, "y":2.25},
-                {"matrix":[8, 5], "x":12.75, "y":2.25},
-                {"matrix":[8, 6], "x":13.75, "y":2.25},
-                {"matrix":[8, 7], "x":14.75, "y":2.25, "w":1.5},
-                {"matrix":[8, 8], "x":16.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 6.75, "y": 2.25},
+                {"matrix": [8, 0], "x": 7.75, "y": 2.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 2.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 2.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 2.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 2.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 2.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 2.25},
+                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.5},
+                {"matrix": [8, 8], "x": 16.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 2], "x":3, "y":3.25},
-                {"matrix":[3, 3], "x":4, "y":3.25},
-                {"matrix":[3, 4], "x":5, "y":3.25},
-                {"matrix":[3, 5], "x":6, "y":3.25},
-                {"matrix":[3, 6], "x":7, "y":3.25},
-                {"matrix":[9, 0], "x":8, "y":3.25},
-                {"matrix":[9, 1], "x":9, "y":3.25},
-                {"matrix":[9, 2], "x":10, "y":3.25},
-                {"matrix":[9, 3], "x":11, "y":3.25},
-                {"matrix":[9, 4], "x":12, "y":3.25},
-                {"matrix":[9, 5], "x":13, "y":3.25},
-                {"matrix":[9, 7], "x":14, "y":3.25, "w":2.25},
-                {"matrix":[9, 8], "x":16.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+                {"matrix": [9, 0], "x": 8, "y": 3.25},
+                {"matrix": [9, 1], "x": 9, "y": 3.25},
+                {"matrix": [9, 2], "x": 10, "y": 3.25},
+                {"matrix": [9, 3], "x": 11, "y": 3.25},
+                {"matrix": [9, 4], "x": 12, "y": 3.25},
+                {"matrix": [9, 5], "x": 13, "y": 3.25},
+                {"matrix": [9, 7], "x": 14, "y": 3.25, "w": 2.25},
+                {"matrix": [9, 8], "x": 16.5, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 2], "x":1.25, "y":4.25, "w":2.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 4], "x":4.5, "y":4.25},
-                {"matrix":[4, 5], "x":5.5, "y":4.25},
-                {"matrix":[4, 6], "x":6.5, "y":4.25},
-                {"matrix":[4, 7], "x":7.5, "y":4.25},
-                {"matrix":[10, 0], "x":8.5, "y":4.25},
-                {"matrix":[10, 1], "x":9.5, "y":4.25},
-                {"matrix":[10, 2], "x":10.5, "y":4.25},
-                {"matrix":[10, 3], "x":11.5, "y":4.25},
-                {"matrix":[10, 4], "x":12.5, "y":4.25},
-                {"matrix":[10, 5], "x":13.5, "y":4.25, "w":1.75},
-                {"matrix":[10, 7], "x":15.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [10, 0], "x": 8.5, "y": 4.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 4.25},
+                {"matrix": [10, 2], "x": 10.5, "y": 4.25},
+                {"matrix": [10, 3], "x": 11.5, "y": 4.25},
+                {"matrix": [10, 4], "x": 12.5, "y": 4.25},
+                {"matrix": [10, 5], "x": 13.5, "y": 4.25, "w": 1.75},
+                {"matrix": [10, 7], "x": 15.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 4], "x":5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":6.25, "y":5.25, "w":2.25},
-                {"matrix":[11, 1], "x":8.5, "y":5.25, "w":2.75},
-                {"matrix":[11, 2], "x":11.25, "y":5.25},
-                {"matrix":[11, 3], "x":12.25, "y":5.25},
-                {"matrix":[11, 4], "x":13.25, "y":5.25},
-                {"matrix":[11, 6], "x":14.5, "y":5.25},
-                {"matrix":[11, 7], "x":15.5, "y":5.25},
-                {"matrix":[11, 8], "x":16.5, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.25, "w": 2.25},
+                {"matrix": [11, 1], "x": 8.5, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 2], "x": 11.25, "y": 5.25},
+                {"matrix": [11, 3], "x": 12.25, "y": 5.25},
+                {"matrix": [11, 4], "x": 13.25, "y": 5.25},
+                {"matrix": [11, 6], "x": 14.5, "y": 5.25},
+                {"matrix": [11, 7], "x": 15.5, "y": 5.25},
+                {"matrix": [11, 8], "x": 16.5, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
index 0314c80224..007c2cafea 100644
--- a/keyboards/keychron/q12/ansi_encoder/info.json
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -21,114 +21,114 @@
     "layouts": {
         "LAYOUT_ansi_103": {
             "layout": [
-                {"matrix":[0, 15], "x":0, "y":0},
-                {"matrix":[0, 16], "x":1, "y":0},
-                {"matrix":[0, 17], "x":2, "y":0},
-                {"matrix":[5, 16], "x":3, "y":0},
-                {"matrix":[0, 0], "x":4.25, "y":0},
-                {"matrix":[0, 1], "x":5.5, "y":0},
-                {"matrix":[0, 2], "x":6.5, "y":0},
-                {"matrix":[0, 3], "x":7.5, "y":0},
-                {"matrix":[0, 4], "x":8.5, "y":0},
-                {"matrix":[0, 5], "x":9.75, "y":0},
-                {"matrix":[0, 6], "x":10.75, "y":0},
-                {"matrix":[0, 7], "x":11.75, "y":0},
-                {"matrix":[0, 8], "x":12.75, "y":0},
-                {"matrix":[0, 9], "x":14, "y":0},
-                {"matrix":[0, 10], "x":15, "y":0},
-                {"matrix":[0, 11], "x":16, "y":0},
-                {"matrix":[0, 12], "x":17, "y":0},
-                {"matrix":[0, 13], "x":18.25, "y":0},
-                {"matrix":[0, 14], "x":19.5, "y":0},
+                {"matrix": [0, 15], "x": 0, "y": 0},
+                {"matrix": [0, 16], "x": 1, "y": 0},
+                {"matrix": [0, 17], "x": 2, "y": 0},
+                {"matrix": [5, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4.25, "y": 0},
+                {"matrix": [0, 1], "x": 5.5, "y": 0},
+                {"matrix": [0, 2], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [0, 13], "x": 18.25, "y": 0},
+                {"matrix": [0, 14], "x": 19.5, "y": 0},
 
-                {"matrix":[1, 15], "x":0, "y":1.25},
-                {"matrix":[1, 16], "x":1, "y":1.25},
-                {"matrix":[1, 17], "x":2, "y":1.25},
-                {"matrix":[5, 5], "x":3, "y":1.25},
-                {"matrix":[1, 0], "x":4.25, "y":1.25},
-                {"matrix":[1, 1], "x":5.25, "y":1.25},
-                {"matrix":[1, 2], "x":6.25, "y":1.25},
-                {"matrix":[1, 3], "x":7.25, "y":1.25},
-                {"matrix":[1, 4], "x":8.25, "y":1.25},
-                {"matrix":[1, 5], "x":9.25, "y":1.25},
-                {"matrix":[1, 6], "x":10.25, "y":1.25},
-                {"matrix":[1, 7], "x":11.25, "y":1.25},
-                {"matrix":[1, 8], "x":12.25, "y":1.25},
-                {"matrix":[1, 9], "x":13.25, "y":1.25},
-                {"matrix":[1, 10], "x":14.25, "y":1.25},
-                {"matrix":[1, 11], "x":15.25, "y":1.25},
-                {"matrix":[1, 12], "x":16.25, "y":1.25},
-                {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2},
-                {"matrix":[1, 14], "x":19.5, "y":1.25},
+                {"matrix": [1, 15], "x": 0, "y": 1.25},
+                {"matrix": [1, 16], "x": 1, "y": 1.25},
+                {"matrix": [1, 17], "x": 2, "y": 1.25},
+                {"matrix": [5, 5], "x": 3, "y": 1.25},
+                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
 
-                {"matrix":[2, 15], "x":0, "y":2.25},
-                {"matrix":[2, 16], "x":1, "y":2.25},
-                {"matrix":[2, 17], "x":2, "y":2.25},
-                {"matrix":[5, 7], "x":3, "y":2.25, "h":2},
-                {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":5.75, "y":2.25},
-                {"matrix":[2, 2], "x":6.75, "y":2.25},
-                {"matrix":[2, 3], "x":7.75, "y":2.25},
-                {"matrix":[2, 4], "x":8.75, "y":2.25},
-                {"matrix":[2, 5], "x":9.75, "y":2.25},
-                {"matrix":[2, 6], "x":10.75, "y":2.25},
-                {"matrix":[2, 7], "x":11.75, "y":2.25},
-                {"matrix":[2, 8], "x":12.75, "y":2.25},
-                {"matrix":[2, 9], "x":13.75, "y":2.25},
-                {"matrix":[2, 10], "x":14.75, "y":2.25},
-                {"matrix":[2, 11], "x":15.75, "y":2.25},
-                {"matrix":[2, 12], "x":16.75, "y":2.25},
-                {"matrix":[2, 13], "x":17.75, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":19.5, "y":2.25},
+                {"matrix": [2, 15], "x": 0, "y": 2.25},
+                {"matrix": [2, 16], "x": 1, "y": 2.25},
+                {"matrix": [2, 17], "x": 2, "y": 2.25},
+                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 17.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
 
-                {"matrix":[3, 15], "x":0, "y":3.25},
-                {"matrix":[3, 16], "x":1, "y":3.25},
-                {"matrix":[3, 17], "x":2, "y":3.25},
-                {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":6, "y":3.25},
-                {"matrix":[3, 2], "x":7, "y":3.25},
-                {"matrix":[3, 3], "x":8, "y":3.25},
-                {"matrix":[3, 4], "x":9, "y":3.25},
-                {"matrix":[3, 5], "x":10, "y":3.25},
-                {"matrix":[3, 6], "x":11, "y":3.25},
-                {"matrix":[3, 7], "x":12, "y":3.25},
-                {"matrix":[3, 8], "x":13, "y":3.25},
-                {"matrix":[3, 9], "x":14, "y":3.25},
-                {"matrix":[3, 10], "x":15, "y":3.25},
-                {"matrix":[3, 11], "x":16, "y":3.25},
-                {"matrix":[3, 13], "x":17, "y":3.25, "w":2.25},
-                {"matrix":[3, 14], "x":19.5, "y":3.25},
+                {"matrix": [3, 15], "x": 0, "y": 3.25},
+                {"matrix": [3, 16], "x": 1, "y": 3.25},
+                {"matrix": [3, 17], "x": 2, "y": 3.25},
+                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 6, "y": 3.25},
+                {"matrix": [3, 2], "x": 7, "y": 3.25},
+                {"matrix": [3, 3], "x": 8, "y": 3.25},
+                {"matrix": [3, 4], "x": 9, "y": 3.25},
+                {"matrix": [3, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [3, 7], "x": 12, "y": 3.25},
+                {"matrix": [3, 8], "x": 13, "y": 3.25},
+                {"matrix": [3, 9], "x": 14, "y": 3.25},
+                {"matrix": [3, 10], "x": 15, "y": 3.25},
+                {"matrix": [3, 11], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 15], "x":0, "y":4.25},
-                {"matrix":[4, 16], "x":1, "y":4.25},
-                {"matrix":[4, 17], "x":2, "y":4.25},
-                {"matrix":[3, 12], "x":3, "y":4.25, "h":2},
-                {"matrix":[4, 0], "x":4.25, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":6.5, "y":4.25},
-                {"matrix":[4, 3], "x":7.5, "y":4.25},
-                {"matrix":[4, 4], "x":8.5, "y":4.25},
-                {"matrix":[4, 5], "x":9.5, "y":4.25},
-                {"matrix":[4, 6], "x":10.5, "y":4.25},
-                {"matrix":[4, 7], "x":11.5, "y":4.25},
-                {"matrix":[4, 8], "x":12.5, "y":4.25},
-                {"matrix":[4, 9], "x":13.5, "y":4.25},
-                {"matrix":[4, 10], "x":14.5, "y":4.25},
-                {"matrix":[4, 11], "x":15.5, "y":4.25},
-                {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":18.5, "y":4.5},
+                {"matrix": [4, 15], "x": 0, "y": 4.25},
+                {"matrix": [4, 16], "x": 1, "y": 4.25},
+                {"matrix": [4, 17], "x": 2, "y": 4.25},
+                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
+                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
 
-                {"matrix":[5, 15], "x":0, "y":5.25, "w":2},
-                {"matrix":[5, 17], "x":2, "y":5.25},
-                {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25},
-                {"matrix":[5, 9], "x":14.25, "y":5.25},
-                {"matrix":[5, 10], "x":15.25, "y":5.25},
-                {"matrix":[5, 11], "x":16.25, "y":5.25},
-                {"matrix":[5, 12], "x":17.5, "y":5.5},
-                {"matrix":[5, 13], "x":18.5, "y":5.5},
-                {"matrix":[5, 14], "x":19.5, "y":5.5}
+                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 17], "x": 2, "y": 5.25},
+                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q12/iso_encoder/info.json b/keyboards/keychron/q12/iso_encoder/info.json
index 1b1a687642..33c719f26b 100644
--- a/keyboards/keychron/q12/iso_encoder/info.json
+++ b/keyboards/keychron/q12/iso_encoder/info.json
@@ -21,115 +21,115 @@
     "layouts": {
         "LAYOUT_iso_104": {
             "layout": [
-                {"matrix":[0, 15], "x":0, "y":0},
-                {"matrix":[0, 16], "x":1, "y":0},
-                {"matrix":[0, 17], "x":2, "y":0},
-                {"matrix":[5, 16], "x":3, "y":0},
-                {"matrix":[0, 0], "x":4.25, "y":0},
-                {"matrix":[0, 1], "x":5.5, "y":0},
-                {"matrix":[0, 2], "x":6.5, "y":0},
-                {"matrix":[0, 3], "x":7.5, "y":0},
-                {"matrix":[0, 4], "x":8.5, "y":0},
-                {"matrix":[0, 5], "x":9.75, "y":0},
-                {"matrix":[0, 6], "x":10.75, "y":0},
-                {"matrix":[0, 7], "x":11.75, "y":0},
-                {"matrix":[0, 8], "x":12.75, "y":0},
-                {"matrix":[0, 9], "x":14, "y":0},
-                {"matrix":[0, 10], "x":15, "y":0},
-                {"matrix":[0, 11], "x":16, "y":0},
-                {"matrix":[0, 12], "x":17, "y":0},
-                {"matrix":[0, 13], "x":18.25, "y":0},
-                {"matrix":[0, 14], "x":19.5, "y":0},
+                {"matrix": [0, 15], "x": 0, "y": 0},
+                {"matrix": [0, 16], "x": 1, "y": 0},
+                {"matrix": [0, 17], "x": 2, "y": 0},
+                {"matrix": [5, 16], "x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 4.25, "y": 0},
+                {"matrix": [0, 1], "x": 5.5, "y": 0},
+                {"matrix": [0, 2], "x": 6.5, "y": 0},
+                {"matrix": [0, 3], "x": 7.5, "y": 0},
+                {"matrix": [0, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.75, "y": 0},
+                {"matrix": [0, 6], "x": 10.75, "y": 0},
+                {"matrix": [0, 7], "x": 11.75, "y": 0},
+                {"matrix": [0, 8], "x": 12.75, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0},
+                {"matrix": [0, 10], "x": 15, "y": 0},
+                {"matrix": [0, 11], "x": 16, "y": 0},
+                {"matrix": [0, 12], "x": 17, "y": 0},
+                {"matrix": [0, 13], "x": 18.25, "y": 0},
+                {"matrix": [0, 14], "x": 19.5, "y": 0},
 
-                {"matrix":[1, 15], "x":0, "y":1.25},
-                {"matrix":[1, 16], "x":1, "y":1.25},
-                {"matrix":[1, 17], "x":2, "y":1.25},
-                {"matrix":[5, 5], "x":3, "y":1.25},
-                {"matrix":[1, 0], "x":4.25, "y":1.25},
-                {"matrix":[1, 1], "x":5.25, "y":1.25},
-                {"matrix":[1, 2], "x":6.25, "y":1.25},
-                {"matrix":[1, 3], "x":7.25, "y":1.25},
-                {"matrix":[1, 4], "x":8.25, "y":1.25},
-                {"matrix":[1, 5], "x":9.25, "y":1.25},
-                {"matrix":[1, 6], "x":10.25, "y":1.25},
-                {"matrix":[1, 7], "x":11.25, "y":1.25},
-                {"matrix":[1, 8], "x":12.25, "y":1.25},
-                {"matrix":[1, 9], "x":13.25, "y":1.25},
-                {"matrix":[1, 10], "x":14.25, "y":1.25},
-                {"matrix":[1, 11], "x":15.25, "y":1.25},
-                {"matrix":[1, 12], "x":16.25, "y":1.25},
-                {"matrix":[1, 13], "x":17.25, "y":1.25, "w":2},
-                {"matrix":[1, 14], "x":19.5, "y":1.25},
+                {"matrix": [1, 15], "x": 0, "y": 1.25},
+                {"matrix": [1, 16], "x": 1, "y": 1.25},
+                {"matrix": [1, 17], "x": 2, "y": 1.25},
+                {"matrix": [5, 5], "x": 3, "y": 1.25},
+                {"matrix": [1, 0], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 1], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 9.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 10.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 11.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+                {"matrix": [1, 9], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 10], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 17.25, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 19.5, "y": 1.25},
 
-                {"matrix":[2, 15], "x":0, "y":2.25},
-                {"matrix":[2, 16], "x":1, "y":2.25},
-                {"matrix":[2, 17], "x":2, "y":2.25},
-                {"matrix":[5, 7], "x":3, "y":2.25, "h":2},
-                {"matrix":[2, 0], "x":4.25, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":5.75, "y":2.25},
-                {"matrix":[2, 2], "x":6.75, "y":2.25},
-                {"matrix":[2, 3], "x":7.75, "y":2.25},
-                {"matrix":[2, 4], "x":8.75, "y":2.25},
-                {"matrix":[2, 5], "x":9.75, "y":2.25},
-                {"matrix":[2, 6], "x":10.75, "y":2.25},
-                {"matrix":[2, 7], "x":11.75, "y":2.25},
-                {"matrix":[2, 8], "x":12.75, "y":2.25},
-                {"matrix":[2, 9], "x":13.75, "y":2.25},
-                {"matrix":[2, 10], "x":14.75, "y":2.25},
-                {"matrix":[2, 11], "x":15.75, "y":2.25},
-                {"matrix":[2, 12], "x":16.75, "y":2.25},
-                {"matrix":[2, 14], "x":19.5, "y":2.25},
+                {"matrix": [2, 15], "x": 0, "y": 2.25},
+                {"matrix": [2, 16], "x": 1, "y": 2.25},
+                {"matrix": [2, 17], "x": 2, "y": 2.25},
+                {"matrix": [5, 7], "x": 3, "y": 2.25, "h": 2},
+                {"matrix": [2, 0], "x": 4.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.75, "y": 2.25},
+                {"matrix": [2, 14], "x": 19.5, "y": 2.25},
 
-                {"matrix":[3, 15], "x":0, "y":3.25},
-                {"matrix":[3, 16], "x":1, "y":3.25},
-                {"matrix":[3, 17], "x":2, "y":3.25},
-                {"matrix":[3, 0], "x":4.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":6, "y":3.25},
-                {"matrix":[3, 2], "x":7, "y":3.25},
-                {"matrix":[3, 3], "x":8, "y":3.25},
-                {"matrix":[3, 4], "x":9, "y":3.25},
-                {"matrix":[3, 5], "x":10, "y":3.25},
-                {"matrix":[3, 6], "x":11, "y":3.25},
-                {"matrix":[3, 7], "x":12, "y":3.25},
-                {"matrix":[3, 8], "x":13, "y":3.25},
-                {"matrix":[3, 9], "x":14, "y":3.25},
-                {"matrix":[3, 10], "x":15, "y":3.25},
-                {"matrix":[3, 11], "x":16, "y":3.25},
-                {"matrix":[3, 13], "x":17, "y":3.25},
-                {"matrix":[2, 13], "x":18, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 14], "x":19.5, "y":3.25},
+                {"matrix": [3, 15], "x": 0, "y": 3.25},
+                {"matrix": [3, 16], "x": 1, "y": 3.25},
+                {"matrix": [3, 17], "x": 2, "y": 3.25},
+                {"matrix": [3, 0], "x": 4.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 6, "y": 3.25},
+                {"matrix": [3, 2], "x": 7, "y": 3.25},
+                {"matrix": [3, 3], "x": 8, "y": 3.25},
+                {"matrix": [3, 4], "x": 9, "y": 3.25},
+                {"matrix": [3, 5], "x": 10, "y": 3.25},
+                {"matrix": [3, 6], "x": 11, "y": 3.25},
+                {"matrix": [3, 7], "x": 12, "y": 3.25},
+                {"matrix": [3, 8], "x": 13, "y": 3.25},
+                {"matrix": [3, 9], "x": 14, "y": 3.25},
+                {"matrix": [3, 10], "x": 15, "y": 3.25},
+                {"matrix": [3, 11], "x": 16, "y": 3.25},
+                {"matrix": [3, 13], "x": 17, "y": 3.25},
+                {"matrix": [2, 13], "x": 18, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 14], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 15], "x":0, "y":4.25},
-                {"matrix":[4, 16], "x":1, "y":4.25},
-                {"matrix":[4, 17], "x":2, "y":4.25},
-                {"matrix":[3, 12], "x":3, "y":4.25, "h":2},
-                {"matrix":[4, 0], "x":4.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":5.5, "y":4.25},
-                {"matrix":[4, 2], "x":6.5, "y":4.25},
-                {"matrix":[4, 3], "x":7.5, "y":4.25},
-                {"matrix":[4, 4], "x":8.5, "y":4.25},
-                {"matrix":[4, 5], "x":9.5, "y":4.25},
-                {"matrix":[4, 6], "x":10.5, "y":4.25},
-                {"matrix":[4, 7], "x":11.5, "y":4.25},
-                {"matrix":[4, 8], "x":12.5, "y":4.25},
-                {"matrix":[4, 9], "x":13.5, "y":4.25},
-                {"matrix":[4, 10], "x":14.5, "y":4.25},
-                {"matrix":[4, 11], "x":15.5, "y":4.25},
-                {"matrix":[4, 13], "x":16.5, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":18.5, "y":4.5},
+                {"matrix": [4, 15], "x": 0, "y": 4.25},
+                {"matrix": [4, 16], "x": 1, "y": 4.25},
+                {"matrix": [4, 17], "x": 2, "y": 4.25},
+                {"matrix": [3, 12], "x": 3, "y": 4.25, "h": 2},
+                {"matrix": [4, 0], "x": 4.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 5.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 6.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 7], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 8], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 18.5, "y": 4.5},
 
-                {"matrix":[5, 15], "x":0, "y":5.25, "w":2},
-                {"matrix":[5, 17], "x":2, "y":5.25},
-                {"matrix":[5, 0], "x":4.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":5.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":6.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":8, "y":5.25, "w":6.25},
-                {"matrix":[5, 9], "x":14.25, "y":5.25},
-                {"matrix":[5, 10], "x":15.25, "y":5.25},
-                {"matrix":[5, 11], "x":16.25, "y":5.25},
-                {"matrix":[5, 12], "x":17.5, "y":5.5},
-                {"matrix":[5, 13], "x":18.5, "y":5.5},
-                {"matrix":[5, 14], "x":19.5, "y":5.5}
+                {"matrix": [5, 15], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 17], "x": 2, "y": 5.25},
+                {"matrix": [5, 0], "x": 4.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 5.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 6.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 8, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 10], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 14], "x": 19.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/ansi/info.json b/keyboards/keychron/q2/ansi/info.json
index f6e367d2c9..8683144f89 100644
--- a/keyboards/keychron/q2/ansi/info.json
+++ b/keyboards/keychron/q2/ansi/info.json
@@ -21,77 +21,77 @@
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/ansi_encoder/info.json b/keyboards/keychron/q2/ansi_encoder/info.json
index 7278109b7c..b05c2e68d2 100644
--- a/keyboards/keychron/q2/ansi_encoder/info.json
+++ b/keyboards/keychron/q2/ansi_encoder/info.json
@@ -26,77 +26,77 @@
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/iso/info.json b/keyboards/keychron/q2/iso/info.json
index f77a07c463..17905eb872 100644
--- a/keyboards/keychron/q2/iso/info.json
+++ b/keyboards/keychron/q2/iso/info.json
@@ -21,78 +21,78 @@
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/iso_encoder/info.json b/keyboards/keychron/q2/iso_encoder/info.json
index c783a990e7..f5a2976bd3 100644
--- a/keyboards/keychron/q2/iso_encoder/info.json
+++ b/keyboards/keychron/q2/iso_encoder/info.json
@@ -26,78 +26,78 @@
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/jis/info.json b/keyboards/keychron/q2/jis/info.json
index 6c9cb2d634..09092873eb 100644
--- a/keyboards/keychron/q2/jis/info.json
+++ b/keyboards/keychron/q2/jis/info.json
@@ -21,81 +21,81 @@
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25},
-                {"matrix":[3, 1], "x":14, "y":0.25},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25},
+                {"matrix": [3, 1], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 12], "x":12.25, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.25},
-                {"matrix":[3, 14], "x":14.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5},
-                {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[2, 12], "x":14.25, "y":4.25},
-                {"matrix":[4, 14], "x":15.25, "y":4.25}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 4.5, "y": 4.25, "w": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q2/jis_encoder/info.json b/keyboards/keychron/q2/jis_encoder/info.json
index 9f3d73d3ef..af22479aa0 100644
--- a/keyboards/keychron/q2/jis_encoder/info.json
+++ b/keyboards/keychron/q2/jis_encoder/info.json
@@ -26,81 +26,81 @@
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25},
-                {"matrix":[3, 1], "x":14, "y":0.25},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25},
+                {"matrix": [3, 1], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 12], "x":12.25, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.25},
-                {"matrix":[3, 14], "x":14.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5},
-                {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[2, 12], "x":14.25, "y":4.25},
-                {"matrix":[4, 14], "x":15.25, "y":4.25}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 4.5, "y": 4.25, "w": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/ansi/info.json b/keyboards/keychron/q3/ansi/info.json
index 5e22787974..3f18242e45 100644
--- a/keyboards/keychron/q3/ansi/info.json
+++ b/keyboards/keychron/q3/ansi/info.json
@@ -16,98 +16,98 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/ansi_encoder/info.json b/keyboards/keychron/q3/ansi_encoder/info.json
index f1e293824d..b536bb235e 100644
--- a/keyboards/keychron/q3/ansi_encoder/info.json
+++ b/keyboards/keychron/q3/ansi_encoder/info.json
@@ -21,99 +21,99 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/iso/info.json b/keyboards/keychron/q3/iso/info.json
index f9f04430c9..e858ee2245 100644
--- a/keyboards/keychron/q3/iso/info.json
+++ b/keyboards/keychron/q3/iso/info.json
@@ -16,99 +16,99 @@
     "layouts": {
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/iso_encoder/info.json b/keyboards/keychron/q3/iso_encoder/info.json
index 79938eccc4..6790d8b06f 100644
--- a/keyboards/keychron/q3/iso_encoder/info.json
+++ b/keyboards/keychron/q3/iso_encoder/info.json
@@ -21,100 +21,100 @@
     "layouts": {
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/jis/info.json b/keyboards/keychron/q3/jis/info.json
index b9cfdc5346..772b8f4c18 100644
--- a/keyboards/keychron/q3/jis/info.json
+++ b/keyboards/keychron/q3/jis/info.json
@@ -16,102 +16,102 @@
     "layouts": {
         "LAYOUT_jis_91": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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":[0, 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":[3, 15], "x":17.25, "y":1.25},
+                {"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": [0, 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": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.75, "y":5.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q3/jis_encoder/info.json b/keyboards/keychron/q3/jis_encoder/info.json
index f379df430e..2bb4242c1b 100644
--- a/keyboards/keychron/q3/jis_encoder/info.json
+++ b/keyboards/keychron/q3/jis_encoder/info.json
@@ -21,103 +21,103 @@
     "layouts": {
         "LAYOUT_jis_92": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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":[5, 5], "x":14, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"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": [5, 5], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.75, "y":5.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q4/ansi_v1/info.json b/keyboards/keychron/q4/ansi_v1/info.json
index 3f05afc196..4de9da9c8d 100644
--- a/keyboards/keychron/q4/ansi_v1/info.json
+++ b/keyboards/keychron/q4/ansi_v1/info.json
@@ -34,58 +34,58 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [1, 1], "x": 1.5, "y":1},
-                {"matrix": [1, 2], "x": 2.5, "y":1},
-                {"matrix": [1, 3], "x": 3.5, "y":1},
-                {"matrix": [1, 4], "x": 4.5, "y":1},
-                {"matrix": [1, 5], "x": 5.5, "y":1},
-                {"matrix": [1, 6], "x": 6.5, "y":1},
-                {"matrix": [1, 7], "x": 7.5, "y":1},
-                {"matrix": [1, 8], "x": 8.5, "y":1},
-                {"matrix": [1, 9], "x": 9.5, "y":1},
-                {"matrix": [1, 10], "x": 10.5, "y":1},
-                {"matrix": [1, 11], "x": 11.5, "y":1},
-                {"matrix": [1, 12], "x": 12.5, "y":1},
-                {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [2, 1], "x":1.75, "y":2},
-                {"matrix": [2, 2], "x":2.75, "y":2},
-                {"matrix": [2, 3], "x":3.75, "y":2},
-                {"matrix": [2, 4], "x":4.75, "y":2},
-                {"matrix": [2, 5], "x":5.75, "y":2},
-                {"matrix": [2, 6], "x":6.75, "y":2},
-                {"matrix": [2, 7], "x":7.75, "y":2},
-                {"matrix": [2, 8], "x":8.75, "y":2},
-                {"matrix": [2, 9], "x":9.75, "y":2},
-                {"matrix": [2, 10], "x":10.75, "y":2},
-                {"matrix": [2, 11], "x":11.75, "y":2},
-                {"matrix": [2, 13], "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"matrix": [3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix": [3, 2], "x":2.25, "y":3},
-                {"matrix": [3, 3], "x":3.25, "y":3},
-                {"matrix": [3, 4], "x":4.25, "y":3},
-                {"matrix": [3, 5], "x":5.25, "y":3},
-                {"matrix": [3, 6], "x":6.25, "y":3},
-                {"matrix": [3, 7], "x":7.25, "y":3},
-                {"matrix": [3, 8], "x":8.25, "y":3},
-                {"matrix": [3, 9], "x":9.25, "y":3},
-                {"matrix": [3, 10], "x":10.25, "y":3},
-                {"matrix": [3, 11], "x":11.25, "y":3},
-                {"matrix": [3, 13], "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25},
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25},
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25},
-                { "matrix": [4, 6], "x":3.75, "y":4, "w":6.25},
-                { "matrix": [4, 10], "x":10, "y":4, "w":1.25},
-                { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25},
-                { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25},
-                { "matrix": [4, 13], "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q4/ansi_v2/info.json b/keyboards/keychron/q4/ansi_v2/info.json
index 3f05afc196..4de9da9c8d 100644
--- a/keyboards/keychron/q4/ansi_v2/info.json
+++ b/keyboards/keychron/q4/ansi_v2/info.json
@@ -34,58 +34,58 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "x":13, "y":0, "w":2},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix": [1, 1], "x": 1.5, "y":1},
-                {"matrix": [1, 2], "x": 2.5, "y":1},
-                {"matrix": [1, 3], "x": 3.5, "y":1},
-                {"matrix": [1, 4], "x": 4.5, "y":1},
-                {"matrix": [1, 5], "x": 5.5, "y":1},
-                {"matrix": [1, 6], "x": 6.5, "y":1},
-                {"matrix": [1, 7], "x": 7.5, "y":1},
-                {"matrix": [1, 8], "x": 8.5, "y":1},
-                {"matrix": [1, 9], "x": 9.5, "y":1},
-                {"matrix": [1, 10], "x": 10.5, "y":1},
-                {"matrix": [1, 11], "x": 11.5, "y":1},
-                {"matrix": [1, 12], "x": 12.5, "y":1},
-                {"matrix": [1, 13], "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [2, 1], "x":1.75, "y":2},
-                {"matrix": [2, 2], "x":2.75, "y":2},
-                {"matrix": [2, 3], "x":3.75, "y":2},
-                {"matrix": [2, 4], "x":4.75, "y":2},
-                {"matrix": [2, 5], "x":5.75, "y":2},
-                {"matrix": [2, 6], "x":6.75, "y":2},
-                {"matrix": [2, 7], "x":7.75, "y":2},
-                {"matrix": [2, 8], "x":8.75, "y":2},
-                {"matrix": [2, 9], "x":9.75, "y":2},
-                {"matrix": [2, 10], "x":10.75, "y":2},
-                {"matrix": [2, 11], "x":11.75, "y":2},
-                {"matrix": [2, 13], "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"matrix": [3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix": [3, 2], "x":2.25, "y":3},
-                {"matrix": [3, 3], "x":3.25, "y":3},
-                {"matrix": [3, 4], "x":4.25, "y":3},
-                {"matrix": [3, 5], "x":5.25, "y":3},
-                {"matrix": [3, 6], "x":6.25, "y":3},
-                {"matrix": [3, 7], "x":7.25, "y":3},
-                {"matrix": [3, 8], "x":8.25, "y":3},
-                {"matrix": [3, 9], "x":9.25, "y":3},
-                {"matrix": [3, 10], "x":10.25, "y":3},
-                {"matrix": [3, 11], "x":11.25, "y":3},
-                {"matrix": [3, 13], "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                { "matrix": [4, 0], "x":0, "y":4, "w":1.25},
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25},
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25},
-                { "matrix": [4, 6], "x":3.75, "y":4, "w":6.25},
-                { "matrix": [4, 10], "x":10, "y":4, "w":1.25},
-                { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25},
-                { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25},
-                { "matrix": [4, 13], "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q4/iso/info.json b/keyboards/keychron/q4/iso/info.json
index 2db65a4690..5d675ff3b5 100644
--- a/keyboards/keychron/q4/iso/info.json
+++ b/keyboards/keychron/q4/iso/info.json
@@ -21,22 +21,22 @@
     "layouts": {
         "LAYOUT_iso_62": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0},
-                {"matrix": [0, 1], "x": 1, "y":0},
-                {"matrix": [0, 2], "x": 2, "y":0},
-                {"matrix": [0, 3], "x": 3, "y":0},
-                {"matrix": [0, 4], "x": 4, "y":0},
-                {"matrix": [0, 5], "x": 5, "y":0},
-                {"matrix": [0, 6], "x": 6, "y":0},
-                {"matrix": [0, 7], "x": 7, "y":0},
-                {"matrix": [0, 8], "x": 8, "y":0},
-                {"matrix": [0, 9], "x": 9, "y":0},
-                {"matrix": [0, 10], "x": 10, "y":0},
-                {"matrix": [0, 11], "x": 11, "y":0},
-                {"matrix": [0, 12], "x": 12, "y":0},
-                {"matrix": [0, 13], "x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix": [1, 0], "x":0, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "x": 2.5, "y": 1},
                 {"matrix": [1, 3], "x": 3.5, "y": 1},
@@ -50,20 +50,20 @@
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix": [2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix": [2, 1], "x": 1.75, "y":2},
-                {"matrix": [2, 2], "x": 2.75, "y":2},
-                {"matrix": [2, 3], "x": 3.75, "y":2},
-                {"matrix": [2, 4], "x": 4.75, "y":2},
-                {"matrix": [2, 5], "x": 5.75, "y":2},
-                {"matrix": [2, 6], "x": 6.75, "y":2},
-                {"matrix": [2, 7], "x": 7.75, "y":2},
-                {"matrix": [2, 8], "x": 8.75, "y":2},
-                {"matrix": [2, 9], "x": 9.75, "y":2},
-                {"matrix": [2, 10], "x": 10.75, "y":2},
-                {"matrix": [2, 11], "x": 11.75, "y":2},
-                {"matrix": [2, 13], "x": 12.75, "y":2},
-                {"matrix": [1, 13], "x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
                 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3},
@@ -77,16 +77,16 @@
                 {"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], "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"matrix": [4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix": [4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix": [4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix": [4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix": [4, 10], "x":10, "y":4, "w":1.25},
-                {"matrix": [4, 11], "x":11.25, "y":4, "w":1.25},
-                {"matrix": [4, 12], "x":12.5, "y":4, "w":1.25},
-                {"matrix": [4, 13], "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/ansi/info.json b/keyboards/keychron/q5/ansi/info.json
index 555034fb80..7be2a38367 100644
--- a/keyboards/keychron/q5/ansi/info.json
+++ b/keyboards/keychron/q5/ansi/info.json
@@ -16,111 +16,111 @@
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/ansi_encoder/info.json b/keyboards/keychron/q5/ansi_encoder/info.json
index 2c828726c7..a1a12f17ed 100644
--- a/keyboards/keychron/q5/ansi_encoder/info.json
+++ b/keyboards/keychron/q5/ansi_encoder/info.json
@@ -21,109 +21,109 @@
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "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":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/iso/info.json b/keyboards/keychron/q5/iso/info.json
index 125cc33736..786fa4a67e 100644
--- a/keyboards/keychron/q5/iso/info.json
+++ b/keyboards/keychron/q5/iso/info.json
@@ -16,112 +16,112 @@
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q5/iso_encoder/info.json b/keyboards/keychron/q5/iso_encoder/info.json
index 4a5e1521cf..650af582af 100644
--- a/keyboards/keychron/q5/iso_encoder/info.json
+++ b/keyboards/keychron/q5/iso_encoder/info.json
@@ -21,110 +21,110 @@
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "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":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q6/ansi/info.json b/keyboards/keychron/q6/ansi/info.json
index 6c343b03f1..f12809d8d0 100644
--- a/keyboards/keychron/q6/ansi/info.json
+++ b/keyboards/keychron/q6/ansi/info.json
@@ -16,119 +16,119 @@
     "layouts": {
         "LAYOUT_ansi_108": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[2, 16], "x":17.25, "y":2.25},
-                {"matrix":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q6/ansi_encoder/info.json b/keyboards/keychron/q6/ansi_encoder/info.json
index e0ce1f4713..ce1ffbb294 100644
--- a/keyboards/keychron/q6/ansi_encoder/info.json
+++ b/keyboards/keychron/q6/ansi_encoder/info.json
@@ -21,120 +21,120 @@
     "layouts": {
         "LAYOUT_ansi_109": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[4, 19], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"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": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[2, 16], "x":17.25, "y":2.25},
-                {"matrix":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q6/iso/info.json b/keyboards/keychron/q6/iso/info.json
index 4441a4bf8e..77285ad1b9 100644
--- a/keyboards/keychron/q6/iso/info.json
+++ b/keyboards/keychron/q6/iso/info.json
@@ -16,120 +16,120 @@
     "layouts": {
         "LAYOUT_iso_109": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 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":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 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": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q6/iso_encoder/info.json b/keyboards/keychron/q6/iso_encoder/info.json
index 0adcec7892..db795c312a 100644
--- a/keyboards/keychron/q6/iso_encoder/info.json
+++ b/keyboards/keychron/q6/iso_encoder/info.json
@@ -21,121 +21,121 @@
     "layouts": {
         "LAYOUT_iso_110": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[4, 19], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"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": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 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":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 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": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index 4756fe0e99..5c915ea1a9 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -21,70 +21,70 @@
     "layouts": {
         "LAYOUT_ansi_60": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[4, 12], "x":14, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [4, 12], "x": 14, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 12], "x":12.25, "y":3, "w":1.75},
-                {"matrix":[3, 13], "x":14, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
 
-                {"matrix":[4, 0], "x":1.5, "y":4},
-                {"matrix":[4, 1], "x":2.5, "y":4, "w":1.5},
-                {"matrix":[4, 6], "x":4, "y":4, "w":7},
-                {"matrix":[4, 10], "x":11, "y":4, "w":1.5},
-                {"matrix":[4, 11], "x":12.5, "y":4}
+                {"matrix": [4, 0], "x": 1.5, "y": 4},
+                {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 12.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index fec4341d54..ce150f5a61 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -24,83 +24,83 @@
     "layouts": {
         "LAYOUT_ansi_73": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0.25},
-                {"matrix":[0, 3], "x":3.5, "y":0.25},
-                {"matrix":[0, 4], "x":4.5, "y":0.25},
-                {"matrix":[0, 5], "x":5.5, "y":0.25},
-                {"matrix":[0, 6], "x":6.5, "y":0.25},
-                {"matrix":[0, 7], "x":7.5, "y":0.25},
-                {"matrix":[0, 8], "x":8.5, "y":0.25},
-                {"matrix":[0, 9], "x":9.5, "y":0.25},
-                {"matrix":[0, 10], "x":10.5, "y":0.25},
-                {"matrix":[0, 11], "x":11.5, "y":0.25},
-                {"matrix":[0, 12], "x":12.5, "y":0.25},
-                {"matrix":[0, 13], "x":13.5, "y":0.25},
-                {"matrix":[0, 14], "x":14.5, "y":0.25, "w":2},
-                {"matrix":[0, 15], "x":17, "y":0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 13.5, "y": 0.25},
+                {"matrix": [0, 14], "x": 14.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 15], "x": 17, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 2], "x":3, "y":1.25},
-                {"matrix":[1, 3], "x":4, "y":1.25},
-                {"matrix":[1, 4], "x":5, "y":1.25},
-                {"matrix":[1, 5], "x":6, "y":1.25},
-                {"matrix":[1, 6], "x":7, "y":1.25},
-                {"matrix":[1, 7], "x":8, "y":1.25},
-                {"matrix":[1, 8], "x":9, "y":1.25},
-                {"matrix":[1, 9], "x":10, "y":1.25},
-                {"matrix":[1, 10], "x":11, "y":1.25},
-                {"matrix":[1, 11], "x":12, "y":1.25},
-                {"matrix":[1, 12], "x":13, "y":1.25},
-                {"matrix":[1, 13], "x":14, "y":1.25},
-                {"matrix":[1, 14], "x":15, "y":1.25, "w":1.5},
-                {"matrix":[1, 15], "x":17, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4, "y": 1.25},
+                {"matrix": [1, 4], "x": 5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6, "y": 1.25},
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [1, 9], "x": 10, "y": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
+                {"matrix": [1, 11], "x": 12, "y": 1.25},
+                {"matrix": [1, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 15], "x": 17, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25},
-                {"matrix":[2, 1], "x":1.5, "y":2.25, "w":1.75},
-                {"matrix":[2, 2], "x":3.25, "y":2.25},
-                {"matrix":[2, 3], "x":4.25, "y":2.25},
-                {"matrix":[2, 4], "x":5.25, "y":2.25},
-                {"matrix":[2, 5], "x":6.25, "y":2.25},
-                {"matrix":[2, 6], "x":7.25, "y":2.25},
-                {"matrix":[2, 7], "x":8.25, "y":2.25},
-                {"matrix":[2, 8], "x":9.25, "y":2.25},
-                {"matrix":[2, 9], "x":10.25, "y":2.25},
-                {"matrix":[2, 10], "x":11.25, "y":2.25},
-                {"matrix":[2, 11], "x":12.25, "y":2.25},
-                {"matrix":[2, 12], "x":13.25, "y":2.25},
-                {"matrix":[2, 14], "x":14.25, "y":2.25, "w":2.25},
-                {"matrix":[2, 15], "x":17, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 13.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 14.25, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 15], "x": 17, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25},
-                {"matrix":[3, 1], "x":1.5, "y":3.25, "w":2.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 12], "x":12.75, "y":3.25},
-                {"matrix":[3, 13], "x":13.75, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17, "y":3.25},
-                {"matrix":[3, 15], "x":15.75, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17, "y": 3.25},
+                {"matrix": [3, 15], "x": 15.75, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":4, "y":4.25, "w":1.25},
-                {"matrix":[4, 7], "x":5.25, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":11.5, "y":4.25},
-                {"matrix":[4, 11], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":13.5, "y":4.25},
-                {"matrix":[4, 13], "x":14.75, "y":4.5},
-                {"matrix":[4, 14], "x":15.75, "y":4.5},
-                {"matrix":[4, 15], "x":16.75, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 4, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 7], "x": 5.25, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 14.75, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.75, "y": 4.5},
+                {"matrix": [4, 15], "x": 16.75, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q7/ansi/info.json b/keyboards/keychron/q7/ansi/info.json
index 5d665c2653..6912d48a9e 100644
--- a/keyboards/keychron/q7/ansi/info.json
+++ b/keyboards/keychron/q7/ansi/info.json
@@ -21,82 +21,82 @@
     "layouts": {
         "LAYOUT_ansi_72": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
-                {"matrix":[0, 14], "x":15, "y":0},
-                {"matrix":[0, 15], "x":16, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
-                {"matrix":[1, 14], "x":15, "y":1},
-                {"matrix":[1, 15], "x":16, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25},
-                {"matrix":[2, 14], "x":15, "y":2},
-                {"matrix":[2, 15], "x":16, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
-                {"matrix":[3, 14], "x":15, "y":3},
-                {"matrix":[3, 15], "x":16, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":4},
-                {"matrix":[4, 10], "x":11, "y":4},
-                {"matrix":[4, 11], "x":12, "y":4},
-                {"matrix":[4, 12], "x":13, "y":4},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
-                {"matrix":[4, 15], "x":16, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keychron/q7/iso/info.json b/keyboards/keychron/q7/iso/info.json
index efa3abdbc9..6b5c9ec668 100644
--- a/keyboards/keychron/q7/iso/info.json
+++ b/keyboards/keychron/q7/iso/info.json
@@ -21,83 +21,83 @@
     "layouts": {
         "LAYOUT_iso_73": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
-                {"matrix":[0, 14], "x":15, "y":0},
-                {"matrix":[0, 15], "x":16, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 14], "x":15, "y":1},
-                {"matrix":[1, 15], "x":16, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2},
-                {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15, "y":2},
-                {"matrix":[2, 15], "x":16, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
-                {"matrix":[3, 14], "x":15, "y":3},
-                {"matrix":[3, 15], "x":16, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":4},
-                {"matrix":[4, 10], "x":11, "y":4},
-                {"matrix":[4, 11], "x":12, "y":4},
-                {"matrix":[4, 12], "x":13, "y":4},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
-                {"matrix":[4, 15], "x":16, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 7ec38683c5..6ef7d5fee1 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -21,79 +21,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index c506224a32..a8838ae8d1 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -26,79 +26,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index 60b4006150..bf7405cce2 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -21,80 +21,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.5, "y":2.25},
-                {"matrix":[2, 12], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index ebcf8a8ee0..f55ccaf202 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -26,80 +26,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.5, "y":2.25},
-                {"matrix":[2, 12], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json
index 28ed46e56d..736467f42f 100644
--- a/keyboards/keychron/q9/ansi/info.json
+++ b/keyboards/keychron/q9/ansi/info.json
@@ -21,61 +21,61 @@
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0.25},
-                {"matrix":[0, 3], "x":3.5, "y":0.25},
-                {"matrix":[0, 4], "x":4.5, "y":0.25},
-                {"matrix":[0, 5], "x":5.5, "y":0.25},
-                {"matrix":[0, 6], "x":6.5, "y":0.25},
-                {"matrix":[0, 7], "x":7.5, "y":0.25},
-                {"matrix":[0, 8], "x":8.5, "y":0.25},
-                {"matrix":[0, 9], "x":9.5, "y":0.25},
-                {"matrix":[0, 10], "x":10.5, "y":0.25},
-                {"matrix":[0, 11], "x":11.5, "y":0.25},
-                {"matrix":[0, 12], "x":12.5, "y":0.25},
-                {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 13.5, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75},
-                {"matrix":[1, 1], "x":1.75, "y":1.25},
-                {"matrix":[1, 2], "x":2.75, "y":1.25},
-                {"matrix":[1, 3], "x":3.75, "y":1.25},
-                {"matrix":[1, 4], "x":4.75, "y":1.25},
-                {"matrix":[1, 5], "x":5.75, "y":1.25},
-                {"matrix":[1, 6], "x":6.75, "y":1.25},
-                {"matrix":[1, 7], "x":7.75, "y":1.25},
-                {"matrix":[1, 8], "x":8.75, "y":1.25},
-                {"matrix":[1, 9], "x":9.75, "y":1.25},
-                {"matrix":[1, 10], "x":10.75, "y":1.25},
-                {"matrix":[1, 11], "x":11.75, "y":1.25},
-                {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.75, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.75, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 12.75, "y": 1.25, "w": 2.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25},
-                {"matrix":[2, 2], "x":2.25, "y":2.25},
-                {"matrix":[2, 3], "x":3.25, "y":2.25},
-                {"matrix":[2, 4], "x":4.25, "y":2.25},
-                {"matrix":[2, 5], "x":5.25, "y":2.25},
-                {"matrix":[2, 6], "x":6.25, "y":2.25},
-                {"matrix":[2, 7], "x":7.25, "y":2.25},
-                {"matrix":[2, 8], "x":8.25, "y":2.25},
-                {"matrix":[2, 9], "x":9.25, "y":2.25},
-                {"matrix":[2, 10], "x":10.25, "y":2.25},
-                {"matrix":[2, 11], "x":11.25, "y":2.25},
-                {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 14], "x":14.25, "y":2.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 14], "x": 14.25, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25},
-                {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25},
-                {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25},
-                {"matrix":[3, 10], "x":10, "y":3.25},
-                {"matrix":[3, 11], "x":11, "y":3.25},
-                {"matrix":[3, 12], "x":12, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.5},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
-                {"matrix":[1, 12], "x":15.25, "y":3.5}
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3.25, "w": 6.25},
+                {"matrix": [3, 10], "x": 10, "y": 3.25},
+                {"matrix": [3, 11], "x": 11, "y": 3.25},
+                {"matrix": [3, 12], "x": 12, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
+                {"matrix": [1, 12], "x": 15.25, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q9/ansi_encoder/info.json b/keyboards/keychron/q9/ansi_encoder/info.json
index e00278143f..95e2a1a2fb 100644
--- a/keyboards/keychron/q9/ansi_encoder/info.json
+++ b/keyboards/keychron/q9/ansi_encoder/info.json
@@ -26,61 +26,61 @@
     "layouts": {
         "LAYOUT_ansi_52": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5},
-                {"matrix":[0, 1], "x":1.5, "y":0.25},
-                {"matrix":[0, 2], "x":2.5, "y":0.25},
-                {"matrix":[0, 3], "x":3.5, "y":0.25},
-                {"matrix":[0, 4], "x":4.5, "y":0.25},
-                {"matrix":[0, 5], "x":5.5, "y":0.25},
-                {"matrix":[0, 6], "x":6.5, "y":0.25},
-                {"matrix":[0, 7], "x":7.5, "y":0.25},
-                {"matrix":[0, 8], "x":8.5, "y":0.25},
-                {"matrix":[0, 9], "x":9.5, "y":0.25},
-                {"matrix":[0, 10], "x":10.5, "y":0.25},
-                {"matrix":[0, 11], "x":11.5, "y":0.25},
-                {"matrix":[0, 12], "x":12.5, "y":0.25},
-                {"matrix":[0, 13], "x":13.5, "y":0.25, "w":1.5},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.5, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.5, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.5, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 12], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 13.5, "y": 0.25, "w": 1.5},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.75},
-                {"matrix":[1, 1], "x":1.75, "y":1.25},
-                {"matrix":[1, 2], "x":2.75, "y":1.25},
-                {"matrix":[1, 3], "x":3.75, "y":1.25},
-                {"matrix":[1, 4], "x":4.75, "y":1.25},
-                {"matrix":[1, 5], "x":5.75, "y":1.25},
-                {"matrix":[1, 6], "x":6.75, "y":1.25},
-                {"matrix":[1, 7], "x":7.75, "y":1.25},
-                {"matrix":[1, 8], "x":8.75, "y":1.25},
-                {"matrix":[1, 9], "x":9.75, "y":1.25},
-                {"matrix":[1, 10], "x":10.75, "y":1.25},
-                {"matrix":[1, 11], "x":11.75, "y":1.25},
-                {"matrix":[1, 13], "x":12.75, "y":1.25, "w":2.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.75, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.75, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.75, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 12.75, "y": 1.25, "w": 2.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":2.25},
-                {"matrix":[2, 2], "x":2.25, "y":2.25},
-                {"matrix":[2, 3], "x":3.25, "y":2.25},
-                {"matrix":[2, 4], "x":4.25, "y":2.25},
-                {"matrix":[2, 5], "x":5.25, "y":2.25},
-                {"matrix":[2, 6], "x":6.25, "y":2.25},
-                {"matrix":[2, 7], "x":7.25, "y":2.25},
-                {"matrix":[2, 8], "x":8.25, "y":2.25},
-                {"matrix":[2, 9], "x":9.25, "y":2.25},
-                {"matrix":[2, 10], "x":10.25, "y":2.25},
-                {"matrix":[2, 11], "x":11.25, "y":2.25},
-                {"matrix":[2, 13], "x":12.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 14], "x":14.25, "y":2.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 14], "x": 14.25, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25, "w":1.25},
-                {"matrix":[3, 2], "x":2.5, "y":3.25, "w":1.25},
-                {"matrix":[3, 6], "x":3.75, "y":3.25, "w":6.25},
-                {"matrix":[3, 10], "x":10, "y":3.25},
-                {"matrix":[3, 11], "x":11, "y":3.25},
-                {"matrix":[3, 12], "x":12, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.5},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
-                {"matrix":[1, 12], "x":15.25, "y":3.5}
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3.25, "w": 6.25},
+                {"matrix": [3, 10], "x": 10, "y": 3.25},
+                {"matrix": [3, 11], "x": 11, "y": 3.25},
+                {"matrix": [3, 12], "x": 12, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.5},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
+                {"matrix": [1, 12], "x": 15.25, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q9/iso/info.json b/keyboards/keychron/q9/iso/info.json
index eb34386ecb..a28b47dcf0 100644
--- a/keyboards/keychron/q9/iso/info.json
+++ b/keyboards/keychron/q9/iso/info.json
@@ -21,62 +21,62 @@
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0, "w":1.5},
-                {"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":[0, 12], "x":12.5, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"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": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.75},
-                {"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], "x":11.75, "y":1},
-                {"matrix":[1, 13], "x":12.75, "y":1},
-                {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"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], "x": 11.75, "y": 1},
+                {"matrix": [1, 13], "x": 12.75, "y": 1},
+                {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.25},
-                {"matrix":[2, 1], "x":1.25, "y":2},
-                {"matrix":[2, 2], "x":2.25, "y":2},
-                {"matrix":[2, 3], "x":3.25, "y":2},
-                {"matrix":[2, 4], "x":4.25, "y":2},
-                {"matrix":[2, 5], "x":5.25, "y":2},
-                {"matrix":[2, 6], "x":6.25, "y":2},
-                {"matrix":[2, 7], "x":7.25, "y":2},
-                {"matrix":[2, 8], "x":8.25, "y":2},
-                {"matrix":[2, 9], "x":9.25, "y":2},
-                {"matrix":[2, 10], "x":10.25, "y":2},
-                {"matrix":[2, 11], "x":11.25, "y":2},
-                {"matrix":[2, 13], "x":12.25, "y":2, "w":1.75},
-                {"matrix":[2, 14], "x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3, "w":1.25},
-                {"matrix":[3, 2], "x":2.5, "y":3, "w":1.25},
-                {"matrix":[3, 6], "x":3.75, "y":3, "w":6.25},
-                {"matrix":[3, 10], "x":10, "y":3},
-                {"matrix":[3, 11], "x":11, "y":3},
-                {"matrix":[3, 12], "x":12, "y":3},
-                {"matrix":[3, 13], "x":13, "y":3},
-                {"matrix":[3, 14], "x":14, "y":3},
-                {"matrix":[1, 12], "x":15, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [1, 12], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keychron/q9/iso_encoder/info.json b/keyboards/keychron/q9/iso_encoder/info.json
index b6d24d46de..f7f1ed8529 100644
--- a/keyboards/keychron/q9/iso_encoder/info.json
+++ b/keyboards/keychron/q9/iso_encoder/info.json
@@ -26,62 +26,62 @@
     "layouts": {
         "LAYOUT_iso_53": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0, "w":1.5},
-                {"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":[0, 12], "x":12.5, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"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": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.75},
-                {"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], "x":11.75, "y":1},
-                {"matrix":[1, 13], "x":12.75, "y":1},
-                {"matrix":[0, 13], "x":13.75, "y":0, "w":1.25, "h":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"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], "x": 11.75, "y": 1},
+                {"matrix": [1, 13], "x": 12.75, "y": 1},
+                {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.25, "h": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.25},
-                {"matrix":[2, 1], "x":1.25, "y":2},
-                {"matrix":[2, 2], "x":2.25, "y":2},
-                {"matrix":[2, 3], "x":3.25, "y":2},
-                {"matrix":[2, 4], "x":4.25, "y":2},
-                {"matrix":[2, 5], "x":5.25, "y":2},
-                {"matrix":[2, 6], "x":6.25, "y":2},
-                {"matrix":[2, 7], "x":7.25, "y":2},
-                {"matrix":[2, 8], "x":8.25, "y":2},
-                {"matrix":[2, 9], "x":9.25, "y":2},
-                {"matrix":[2, 10], "x":10.25, "y":2},
-                {"matrix":[2, 11], "x":11.25, "y":2},
-                {"matrix":[2, 13], "x":12.25, "y":2, "w":1.75},
-                {"matrix":[2, 14], "x":14, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2},
+                {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 14], "x": 14, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3, "w":1.25},
-                {"matrix":[3, 2], "x":2.5, "y":3, "w":1.25},
-                {"matrix":[3, 6], "x":3.75, "y":3, "w":6.25},
-                {"matrix":[3, 10], "x":10, "y":3},
-                {"matrix":[3, 11], "x":11, "y":3},
-                {"matrix":[3, 12], "x":12, "y":3},
-                {"matrix":[3, 13], "x":13, "y":3},
-                {"matrix":[3, 14], "x":14, "y":3},
-                {"matrix":[1, 12], "x":15, "y":3}
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 6], "x": 3.75, "y": 3, "w": 6.25},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [1, 12], "x": 15, "y": 3}
             ]
         }
     }
diff --git a/keyboards/keychron/s1/ansi/rgb/info.json b/keyboards/keychron/s1/ansi/rgb/info.json
index 82ec24e3fb..de3fdef573 100644
--- a/keyboards/keychron/s1/ansi/rgb/info.json
+++ b/keyboards/keychron/s1/ansi/rgb/info.json
@@ -25,95 +25,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[3, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1, 10], "x":10, "y":1},
-                {"matrix":[1, 11], "x":11, "y":1},
-                {"matrix":[1, 12], "x":12, "y":1},
-                {"matrix":[1, 13], "x":13, "y":1, "w":2},
-                {"matrix":[1, 14], "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2, 10], "x":10.5, "y":2},
-                {"matrix":[2, 11], "x":11.5, "y":2},
-                {"matrix":[2, 12], "x":12.5, "y":2},
-                {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2, 14], "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "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, 13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3, 14], "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4, 10], "x":10.25, "y":4},
-                {"matrix":[4, 11], "x":11.25, "y":4},
-                {"matrix":[4, 12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
 
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5, 10], "x":11, "y":5},
-                {"matrix":[5, 11], "x":12, "y":5},
-                {"matrix":[5, 12], "x":13, "y":5},
-                {"matrix":[5, 13], "x":14, "y":5},
-                {"matrix":[5, 14], "x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 11], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/keychron/s1/ansi/white/info.json b/keyboards/keychron/s1/ansi/white/info.json
index 04580e30b4..6d4d90525c 100644
--- a/keyboards/keychron/s1/ansi/white/info.json
+++ b/keyboards/keychron/s1/ansi/white/info.json
@@ -25,95 +25,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[3, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [3, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1},
-                {"matrix":[1, 1], "x":1, "y":1},
-                {"matrix":[1, 2], "x":2, "y":1},
-                {"matrix":[1, 3], "x":3, "y":1},
-                {"matrix":[1, 4], "x":4, "y":1},
-                {"matrix":[1, 5], "x":5, "y":1},
-                {"matrix":[1, 6], "x":6, "y":1},
-                {"matrix":[1, 7], "x":7, "y":1},
-                {"matrix":[1, 8], "x":8, "y":1},
-                {"matrix":[1, 9], "x":9, "y":1},
-                {"matrix":[1, 10], "x":10, "y":1},
-                {"matrix":[1, 11], "x":11, "y":1},
-                {"matrix":[1, 12], "x":12, "y":1},
-                {"matrix":[1, 13], "x":13, "y":1, "w":2},
-                {"matrix":[1, 14], "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2},
-                {"matrix":[2, 2], "x":2.5, "y":2},
-                {"matrix":[2, 3], "x":3.5, "y":2},
-                {"matrix":[2, 4], "x":4.5, "y":2},
-                {"matrix":[2, 5], "x":5.5, "y":2},
-                {"matrix":[2, 6], "x":6.5, "y":2},
-                {"matrix":[2, 7], "x":7.5, "y":2},
-                {"matrix":[2, 8], "x":8.5, "y":2},
-                {"matrix":[2, 9], "x":9.5, "y":2},
-                {"matrix":[2, 10], "x":10.5, "y":2},
-                {"matrix":[2, 11], "x":11.5, "y":2},
-                {"matrix":[2, 12], "x":12.5, "y":2},
-                {"matrix":[2, 13], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[2, 14], "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [2, 7], "x": 7.5, "y": 2},
+                {"matrix": [2, 8], "x": 8.5, "y": 2},
+                {"matrix": [2, 9], "x": 9.5, "y": 2},
+                {"matrix": [2, 10], "x": 10.5, "y": 2},
+                {"matrix": [2, 11], "x": 11.5, "y": 2},
+                {"matrix": [2, 12], "x": 12.5, "y": 2},
+                {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3},
-                {"matrix":[3, 2], "x":2.75, "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, 13], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[3, 14], "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "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, 13], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4},
-                {"matrix":[4, 3], "x":3.25, "y":4},
-                {"matrix":[4, 4], "x":4.25, "y":4},
-                {"matrix":[4, 5], "x":5.25, "y":4},
-                {"matrix":[4, 6], "x":6.25, "y":4},
-                {"matrix":[4, 7], "x":7.25, "y":4},
-                {"matrix":[4, 8], "x":8.25, "y":4},
-                {"matrix":[4, 9], "x":9.25, "y":4},
-                {"matrix":[4, 10], "x":10.25, "y":4},
-                {"matrix":[4, 11], "x":11.25, "y":4},
-                {"matrix":[4, 12], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
 
-                {"matrix":[5, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[5, 9], "x":10, "y":5},
-                {"matrix":[5, 10], "x":11, "y":5},
-                {"matrix":[5, 11], "x":12, "y":5},
-                {"matrix":[5, 12], "x":13, "y":5},
-                {"matrix":[5, 13], "x":14, "y":5},
-                {"matrix":[5, 14], "x":15, "y":5}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5},
+                {"matrix": [5, 10], "x": 11, "y": 5},
+                {"matrix": [5, 11], "x": 12, "y": 5},
+                {"matrix": [5, 12], "x": 13, "y": 5},
+                {"matrix": [5, 13], "x": 14, "y": 5},
+                {"matrix": [5, 14], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json
index e6326a9538..696f434622 100644
--- a/keyboards/keychron/v1/ansi/info.json
+++ b/keyboards/keychron/v1/ansi/info.json
@@ -16,93 +16,93 @@
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json
index 303f1e6475..6829cd7f76 100644
--- a/keyboards/keychron/v1/ansi_encoder/info.json
+++ b/keyboards/keychron/v1/ansi_encoder/info.json
@@ -21,93 +21,93 @@
     "layouts": {
         "LAYOUT_ansi_82": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json
index 4ebb8607f3..871358a86b 100644
--- a/keyboards/keychron/v1/iso/info.json
+++ b/keyboards/keychron/v1/iso/info.json
@@ -16,94 +16,94 @@
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json
index fcd2dbb793..bffa90acad 100644
--- a/keyboards/keychron/v1/iso_encoder/info.json
+++ b/keyboards/keychron/v1/iso_encoder/info.json
@@ -21,94 +21,94 @@
     "layouts": {
         "LAYOUT_iso_83": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json
index efdb9664f1..173794430c 100644
--- a/keyboards/keychron/v1/jis/info.json
+++ b/keyboards/keychron/v1/jis/info.json
@@ -16,97 +16,97 @@
     "layouts": {
         "LAYOUT_jis_86": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.251},
-                {"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":[1, 14], "x":14, "y":1.25},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"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.251},
+                {"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": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25},
-                {"matrix":[5, 12], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.25},
-                {"matrix":[5, 14], "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "x":15.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json
index 511d33f01e..73313eb64d 100644
--- a/keyboards/keychron/v1/jis_encoder/info.json
+++ b/keyboards/keychron/v1/jis_encoder/info.json
@@ -21,97 +21,97 @@
     "layouts": {
         "LAYOUT_jis_86": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.25, "y":0},
+                {"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, 15], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.251},
-                {"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":[1, 14], "x":14, "y":1.25},
-                {"matrix":[1, 15], "x":15.25, "y":1.25},
+                {"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.251},
+                {"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": [1, 14], "x": 14, "y": 1.25},
+                {"matrix": [1, 15], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25},
-                {"matrix":[5, 12], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.25},
-                {"matrix":[5, 14], "x":14.25, "y":5.25},
-                {"matrix":[5, 15], "x":15.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index 3df1d8212a..813a076bdc 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -24,100 +24,100 @@
     "layouts": {
         "LAYOUT_ansi_89": {
             "layout": [
-                {"matrix":[0, 0], "x":0.25, "y":0},
-                {"matrix":[0, 1], "x":1.75, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6, "y":0},
-                {"matrix":[0, 6], "x":7.25, "y":0},
-                {"matrix":[0, 7], "x":8.25, "y":0},
-                {"matrix":[0, 8], "x":11, "y":0},
-                {"matrix":[0, 9], "x":12, "y":0},
-                {"matrix":[0, 10], "x":13.25, "y":0},
-                {"matrix":[0, 11], "x":14.25, "y":0},
-                {"matrix":[0, 12], "x":15.25, "y":0},
-                {"matrix":[0, 13], "x":16.25, "y":0},
-                {"matrix":[0, 14], "x":17.5, "y":0},
-                {"matrix":[0, 15], "x":18.75, "y":0},
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
 
-                {"matrix":[1, 0], "x":0.75, "y":1.25},
-                {"matrix":[1, 1], "x":2.25, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":7.25, "y":1.25},
-                {"matrix":[1, 7], "x":8.25, "y":1.25},
-                {"matrix":[1, 8], "x":10.5, "y":1.25},
-                {"matrix":[1, 9], "x":11.5, "y":1.25},
-                {"matrix":[1, 10], "x":12.5, "y":1.25},
-                {"matrix":[1, 11], "x":13.5, "y":1.25},
-                {"matrix":[1, 12], "x":14.5, "y":1.25},
-                {"matrix":[1, 13], "x":15.5, "y":1.25},
-                {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":19, "y":1.25},
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0.5, "y":2.25},
-                {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
-                {"matrix":[2, 2], "x":3.25, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":7.5, "y":2.25},
-                {"matrix":[2, 7], "x":10, "y":2.25},
-                {"matrix":[2, 8], "x":11, "y":2.25},
-                {"matrix":[2, 9], "x":12, "y":2.25},
-                {"matrix":[2, 10], "x":13, "y":2.25},
-                {"matrix":[2, 11], "x":14, "y":2.25},
-                {"matrix":[2, 12], "x":15.25, "y":2.25},
-                {"matrix":[2, 13], "x":16.25, "y":2.25},
-                {"matrix":[2, 14], "x":17.25, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":19.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0.25, "y":3.25},
-                {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
-                {"matrix":[3, 2], "x":3.25, "y":3.25},
-                {"matrix":[3, 3], "x":4.5, "y":3.25},
-                {"matrix":[3, 4], "x":5.5, "y":3.25},
-                {"matrix":[3, 5], "x":6.5, "y":3.25},
-                {"matrix":[3, 6], "x":7.5, "y":3.25},
-                {"matrix":[3, 8], "x":10.25, "y":3.25},
-                {"matrix":[3, 9], "x":11.25, "y":3.25},
-                {"matrix":[3, 10], "x":12.25, "y":3.25},
-                {"matrix":[3, 11], "x":13.25, "y":3.25},
-                {"matrix":[3, 12], "x":14.75, "y":3.25},
-                {"matrix":[3, 13], "x":15.75, "y":3.25},
-                {"matrix":[3, 14], "x":16.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":19.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25, "w":2.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 4], "x":4.75, "y":4.25},
-                {"matrix":[4, 5], "x":5.75, "y":4.25},
-                {"matrix":[4, 6], "x":6.75, "y":4.25},
-                {"matrix":[4, 7], "x":7.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.5, "y":4.25},
-                {"matrix":[4, 9], "x":10.5, "y":4.25},
-                {"matrix":[4, 10], "x":11.5, "y":4.25},
-                {"matrix":[4, 11], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":13.5, "y":4.25},
-                {"matrix":[4, 13], "x":15.25, "y":4.25},
-                {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":18.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":4.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
-                {"matrix":[5, 7], "x":8.25, "y":5.25},
-                {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
-                {"matrix":[5, 9], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":17.25, "y":5.5},
-                {"matrix":[5, 14], "x":18.25, "y":5.5},
-                {"matrix":[5, 15], "x":19.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 5e4bb8c32f..9cf0add090 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -24,101 +24,101 @@
     "layouts": {
         "LAYOUT_iso_90": {
             "layout": [
-                {"matrix":[0, 0], "x":0.25, "y":0},
-                {"matrix":[0, 1], "x":1.75, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6, "y":0},
-                {"matrix":[0, 6], "x":7.25, "y":0},
-                {"matrix":[0, 7], "x":8.25, "y":0},
-                {"matrix":[0, 8], "x":11, "y":0},
-                {"matrix":[0, 9], "x":12, "y":0},
-                {"matrix":[0, 10], "x":13.25, "y":0},
-                {"matrix":[0, 11], "x":14.25, "y":0},
-                {"matrix":[0, 12], "x":15.25, "y":0},
-                {"matrix":[0, 13], "x":16.25, "y":0},
-                {"matrix":[0, 14], "x":17.5, "y":0},
-                {"matrix":[0, 15], "x":18.75, "y":0},
+                {"matrix": [0, 0], "x": 0.25, "y": 0},
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"matrix": [0, 7], "x": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13.25, "y": 0},
+                {"matrix": [0, 11], "x": 14.25, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 13], "x": 16.25, "y": 0},
+                {"matrix": [0, 14], "x": 17.5, "y": 0},
+                {"matrix": [0, 15], "x": 18.75, "y": 0},
 
-                {"matrix":[1, 0], "x":0.75, "y":1.25},
-                {"matrix":[1, 1], "x":2.25, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":7.25, "y":1.25},
-                {"matrix":[1, 7], "x":8.25, "y":1.25},
-                {"matrix":[1, 8], "x":10.5, "y":1.25},
-                {"matrix":[1, 9], "x":11.5, "y":1.25},
-                {"matrix":[1, 10], "x":12.5, "y":1.25},
-                {"matrix":[1, 11], "x":13.5, "y":1.25},
-                {"matrix":[1, 12], "x":14.5, "y":1.25},
-                {"matrix":[1, 13], "x":15.5, "y":1.25},
-                {"matrix":[1, 14], "x":16.5, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":19, "y":1.25},
+                {"matrix": [1, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.25, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.5, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 19, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0.5, "y":2.25},
-                {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
-                {"matrix":[2, 2], "x":3.25, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":7.5, "y":2.25},
-                {"matrix":[2, 7], "x":10, "y":2.25},
-                {"matrix":[2, 8], "x":11, "y":2.25},
-                {"matrix":[2, 9], "x":12, "y":2.25},
-                {"matrix":[2, 10], "x":13, "y":2.25},
-                {"matrix":[2, 11], "x":14, "y":2.25},
-                {"matrix":[2, 12], "x":15.25, "y":2.25},
-                {"matrix":[2, 13], "x":16.25, "y":2.25},
-                {"matrix":[2, 15], "x":19.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0.5, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0.25, "y":3.25},
-                {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
-                {"matrix":[3, 2], "x":3.25, "y":3.25},
-                {"matrix":[3, 3], "x":4.5, "y":3.25},
-                {"matrix":[3, 4], "x":5.5, "y":3.25},
-                {"matrix":[3, 5], "x":6.5, "y":3.25},
-                {"matrix":[3, 6], "x":7.5, "y":3.25},
-                {"matrix":[3, 8], "x":10.25, "y":3.25},
-                {"matrix":[3, 9], "x":11.25, "y":3.25},
-                {"matrix":[3, 10], "x":12.25, "y":3.25},
-                {"matrix":[3, 11], "x":13.25, "y":3.25},
-                {"matrix":[3, 12], "x":14.75, "y":3.25},
-                {"matrix":[3, 13], "x":15.75, "y":3.25},
-                {"matrix":[3, 14], "x":16.75, "y":3.25},
-                {"matrix":[2, 14], "x":17.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":19.5, "y":3.25},
+                {"matrix": [3, 0], "x": 0.25, "y": 3.25},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.5, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 16.75, "y": 3.25},
+                {"matrix": [2, 14], "x": 17.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 19.5, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25},
-                {"matrix":[4, 1], "x":1.5, "y":4.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 4], "x":4.75, "y":4.25},
-                {"matrix":[4, 5], "x":5.75, "y":4.25},
-                {"matrix":[4, 6], "x":6.75, "y":4.25},
-                {"matrix":[4, 7], "x":7.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.5, "y":4.25},
-                {"matrix":[4, 9], "x":10.5, "y":4.25},
-                {"matrix":[4, 10], "x":11.5, "y":4.25},
-                {"matrix":[4, 11], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":13.5, "y":4.25},
-                {"matrix":[4, 13], "x":15.25, "y":4.25},
-                {"matrix":[4, 14], "x":16.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":18.25, "y":4.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.5, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.5, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 15.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 16.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 18.25, "y": 4.5},
 
-                {"matrix":[5, 0], "x":0, "y":5.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":4.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
-                {"matrix":[5, 7], "x":8.25, "y":5.25},
-                {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
-                {"matrix":[5, 9], "x":12.25, "y":5.25},
-                {"matrix":[5, 13], "x":17.25, "y":5.5},
-                {"matrix":[5, 14], "x":18.25, "y":5.5},
-                {"matrix":[5, 15], "x":19.25, "y":5.5}
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 7], "x": 8.25, "y": 5.25},
+                {"matrix": [5, 8], "x": 9.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 12.25, "y": 5.25},
+                {"matrix": [5, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 19.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/ansi/info.json b/keyboards/keychron/v2/ansi/info.json
index 969eae09a2..7d844d0c1d 100644
--- a/keyboards/keychron/v2/ansi/info.json
+++ b/keyboards/keychron/v2/ansi/info.json
@@ -21,77 +21,77 @@
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/ansi_encoder/info.json b/keyboards/keychron/v2/ansi_encoder/info.json
index 9676278be1..8de781ab9c 100644
--- a/keyboards/keychron/v2/ansi_encoder/info.json
+++ b/keyboards/keychron/v2/ansi_encoder/info.json
@@ -26,77 +26,77 @@
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 13], "x":13.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/iso/info.json b/keyboards/keychron/v2/iso/info.json
index 8afe06f047..45ba9503e4 100644
--- a/keyboards/keychron/v2/iso/info.json
+++ b/keyboards/keychron/v2/iso/info.json
@@ -21,78 +21,78 @@
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/iso_encoder/info.json b/keyboards/keychron/v2/iso_encoder/info.json
index 4aef5b79b2..d517e341df 100644
--- a/keyboards/keychron/v2/iso_encoder/info.json
+++ b/keyboards/keychron/v2/iso_encoder/info.json
@@ -1,4 +1,5 @@
-{    "keyboard_name": "Keychron V2",
+{
+    "keyboard_name": "Keychron V2",
     "manufacturer": "Keychron",
     "url": "https://github.com/Keychron",
     "maintainer": "lalalademaxiya1",
@@ -25,78 +26,78 @@
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 13], "x":12.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":14.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4.25, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4.25, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4.25},
-                {"matrix":[4, 11], "x":11, "y":4.25},
-                {"matrix":[4, 12], "x":12, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.5},
-                {"matrix":[2, 12], "x":14.25, "y":4.5},
-                {"matrix":[4, 14], "x":15.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4.25},
+                {"matrix": [4, 11], "x": 11, "y": 4.25},
+                {"matrix": [4, 12], "x": 12, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.5},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/jis/info.json b/keyboards/keychron/v2/jis/info.json
index 91283ef4f7..6a705e7f8c 100644
--- a/keyboards/keychron/v2/jis/info.json
+++ b/keyboards/keychron/v2/jis/info.json
@@ -21,81 +21,81 @@
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25},
-                {"matrix":[3, 1], "x":14, "y":0.25},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25},
+                {"matrix": [3, 1], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 12], "x":12.25, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.25},
-                {"matrix":[3, 14], "x":14.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5},
-                {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[2, 12], "x":14.25, "y":4.25},
-                {"matrix":[4, 14], "x":15.25, "y":4.25}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 4.5, "y": 4.25, "w": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v2/jis_encoder/info.json b/keyboards/keychron/v2/jis_encoder/info.json
index 8e2683342d..028432f7f7 100644
--- a/keyboards/keychron/v2/jis_encoder/info.json
+++ b/keyboards/keychron/v2/jis_encoder/info.json
@@ -26,81 +26,81 @@
     "layouts": {
         "LAYOUT_jis_71": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0.25},
-                {"matrix":[0, 1], "x":1, "y":0.25},
-                {"matrix":[0, 2], "x":2, "y":0.25},
-                {"matrix":[0, 3], "x":3, "y":0.25},
-                {"matrix":[0, 4], "x":4, "y":0.25},
-                {"matrix":[0, 5], "x":5, "y":0.25},
-                {"matrix":[0, 6], "x":6, "y":0.25},
-                {"matrix":[0, 7], "x":7, "y":0.25},
-                {"matrix":[0, 8], "x":8, "y":0.25},
-                {"matrix":[0, 9], "x":9, "y":0.25},
-                {"matrix":[0, 10], "x":10, "y":0.25},
-                {"matrix":[0, 11], "x":11, "y":0.25},
-                {"matrix":[0, 12], "x":12, "y":0.25},
-                {"matrix":[0, 13], "x":13, "y":0.25},
-                {"matrix":[3, 1], "x":14, "y":0.25},
-                {"matrix":[0, 14], "x":15.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25},
+                {"matrix": [3, 1], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1.25},
-                {"matrix":[1, 2], "x":2.5, "y":1.25},
-                {"matrix":[1, 3], "x":3.5, "y":1.25},
-                {"matrix":[1, 4], "x":4.5, "y":1.25},
-                {"matrix":[1, 5], "x":5.5, "y":1.25},
-                {"matrix":[1, 6], "x":6.5, "y":1.25},
-                {"matrix":[1, 7], "x":7.5, "y":1.25},
-                {"matrix":[1, 8], "x":8.5, "y":1.25},
-                {"matrix":[1, 9], "x":9.5, "y":1.25},
-                {"matrix":[1, 10], "x":10.5, "y":1.25},
-                {"matrix":[1, 11], "x":11.5, "y":1.25},
-                {"matrix":[1, 12], "x":12.5, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2.25},
-                {"matrix":[2, 2], "x":2.75, "y":2.25},
-                {"matrix":[2, 3], "x":3.75, "y":2.25},
-                {"matrix":[2, 4], "x":4.75, "y":2.25},
-                {"matrix":[2, 5], "x":5.75, "y":2.25},
-                {"matrix":[2, 6], "x":6.75, "y":2.25},
-                {"matrix":[2, 7], "x":7.75, "y":2.25},
-                {"matrix":[2, 8], "x":8.75, "y":2.25},
-                {"matrix":[2, 9], "x":9.75, "y":2.25},
-                {"matrix":[2, 10], "x":10.75, "y":2.25},
-                {"matrix":[2, 11], "x":11.75, "y":2.25},
-                {"matrix":[2, 13], "x":12.75, "y":2.25},
-                {"matrix":[1, 13], "x":13.75, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25},
+                {"matrix": [1, 13], "x": 13.75, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.25, "y":3.25},
-                {"matrix":[3, 4], "x":4.25, "y":3.25},
-                {"matrix":[3, 5], "x":5.25, "y":3.25},
-                {"matrix":[3, 6], "x":6.25, "y":3.25},
-                {"matrix":[3, 7], "x":7.25, "y":3.25},
-                {"matrix":[3, 8], "x":8.25, "y":3.25},
-                {"matrix":[3, 9], "x":9.25, "y":3.25},
-                {"matrix":[3, 10], "x":10.25, "y":3.25},
-                {"matrix":[3, 11], "x":11.25, "y":3.25},
-                {"matrix":[3, 12], "x":12.25, "y":3.25},
-                {"matrix":[3, 13], "x":13.25, "y":3.25},
-                {"matrix":[3, 14], "x":14.25, "y":3.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 14], "x": 14.25, "y": 3.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":3.5, "y":4.25},
-                {"matrix":[4, 6], "x":4.5, "y":4.25, "w":4.5},
-                {"matrix":[4, 9], "x":9, "y":4.25, "w":1.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25},
-                {"matrix":[2, 12], "x":14.25, "y":4.25},
-                {"matrix":[4, 14], "x":15.25, "y":4.25}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 6], "x": 4.5, "y": 4.25, "w": 4.5},
+                {"matrix": [4, 9], "x": 9, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25},
+                {"matrix": [2, 12], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 14], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/ansi/info.json b/keyboards/keychron/v3/ansi/info.json
index ccb9166cf0..e0d7fdb63d 100644
--- a/keyboards/keychron/v3/ansi/info.json
+++ b/keyboards/keychron/v3/ansi/info.json
@@ -16,98 +16,98 @@
     "layouts": {
         "LAYOUT_tkl_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/ansi_encoder/info.json b/keyboards/keychron/v3/ansi_encoder/info.json
index 7760b1107b..3232da0fba 100644
--- a/keyboards/keychron/v3/ansi_encoder/info.json
+++ b/keyboards/keychron/v3/ansi_encoder/info.json
@@ -21,99 +21,99 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/iso/info.json b/keyboards/keychron/v3/iso/info.json
index 0ebb41d417..3ba7acb322 100644
--- a/keyboards/keychron/v3/iso/info.json
+++ b/keyboards/keychron/v3/iso/info.json
@@ -16,99 +16,99 @@
     "layouts": {
         "LAYOUT_tkl_iso": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/iso_encoder/info.json b/keyboards/keychron/v3/iso_encoder/info.json
index 0b6a7c1019..5cd2631c12 100644
--- a/keyboards/keychron/v3/iso_encoder/info.json
+++ b/keyboards/keychron/v3/iso_encoder/info.json
@@ -21,100 +21,100 @@
     "layouts": {
         "LAYOUT_tkl_f13_iso": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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, "w":2},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/jis/info.json b/keyboards/keychron/v3/jis/info.json
index 43ee08e448..4680d5e0b5 100644
--- a/keyboards/keychron/v3/jis/info.json
+++ b/keyboards/keychron/v3/jis/info.json
@@ -16,102 +16,102 @@
     "layouts": {
         "LAYOUT_jis_91": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+                {"matrix": [3, 14], "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":[0, 13], "x":13, "y":1.25},
-                {"matrix":[1, 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":[3, 15], "x":17.25, "y":1.25},
+                {"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": [0, 13], "x": 13, "y": 1.25},
+                {"matrix": [1, 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": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.75, "y":5.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v3/jis_encoder/info.json b/keyboards/keychron/v3/jis_encoder/info.json
index 85184c0a3d..2cc5207006 100644
--- a/keyboards/keychron/v3/jis_encoder/info.json
+++ b/keyboards/keychron/v3/jis_encoder/info.json
@@ -21,103 +21,103 @@
     "layouts": {
         "LAYOUT_jis_92": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[0, 13], "x":14, "y":0},
-                {"matrix":[0, 14], "x":15.25, "y":0},
-                {"matrix":[0, 15], "x":16.25, "y":0},
-                {"matrix":[3, 14], "x":17.25, "y":0},
+                {"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": [3, 14], "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":[5, 5], "x":14, "y":1.25},
-                {"matrix":[1, 14], "x":15.25, "y":1.25},
-                {"matrix":[1, 15], "x":16.25, "y":1.25},
-                {"matrix":[3, 15], "x":17.25, "y":1.25},
+                {"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": [5, 5], "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[3, 12], "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [3, 12], "x": 17.25, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 12], "x":12.25, "y":4.25},
-                {"matrix":[4, 13], "x":13.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "x": 12.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25},
-                {"matrix":[5, 2], "x":2.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 3], "x":3.5, "y":5.25},
-                {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5},
-                {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25},
-                {"matrix":[5, 10], "x":10.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.75, "y":5.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[4, 14], "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5},
+                {"matrix": [5, 9], "x": 9, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [4, 14], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v4/ansi/info.json b/keyboards/keychron/v4/ansi/info.json
index 11d246a121..e45a9c18d5 100644
--- a/keyboards/keychron/v4/ansi/info.json
+++ b/keyboards/keychron/v4/ansi/info.json
@@ -21,71 +21,71 @@
     "layouts": {
         "LAYOUT_ansi_61": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4, "w":1.25},
-                {"matrix":[4, 11], "x":11.25, "y":4, "w":1.25},
-                {"matrix":[4, 12], "x":12.5, "y":4, "w":1.25},
-                {"matrix":[4, 13], "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v4/iso/info.json b/keyboards/keychron/v4/iso/info.json
index 362875903f..fd9a9a81df 100644
--- a/keyboards/keychron/v4/iso/info.json
+++ b/keyboards/keychron/v4/iso/info.json
@@ -21,72 +21,72 @@
     "layouts": {
         "LAYOUT_iso_62": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2},
-                {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 10], "x":10, "y":4, "w":1.25},
-                {"matrix":[4, 11], "x":11.25, "y":4, "w":1.25},
-                {"matrix":[4, 12], "x":12.5, "y":4, "w":1.25},
-                {"matrix":[4, 13], "x":13.75, "y":4, "w":1.25}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keychron/v5/ansi/info.json b/keyboards/keychron/v5/ansi/info.json
index 62d6a5332c..7b087b7033 100644
--- a/keyboards/keychron/v5/ansi/info.json
+++ b/keyboards/keychron/v5/ansi/info.json
@@ -16,111 +16,111 @@
     "layouts": {
         "LAYOUT_ansi_100": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v5/ansi_encoder/info.json b/keyboards/keychron/v5/ansi_encoder/info.json
index 2b16b37c37..32824efe6b 100644
--- a/keyboards/keychron/v5/ansi_encoder/info.json
+++ b/keyboards/keychron/v5/ansi_encoder/info.json
@@ -21,109 +21,109 @@
     "layouts": {
         "LAYOUT_ansi_98": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "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":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v5/iso/info.json b/keyboards/keychron/v5/iso/info.json
index ab7765ea58..0fac99cd38 100644
--- a/keyboards/keychron/v5/iso/info.json
+++ b/keyboards/keychron/v5/iso/info.json
@@ -16,112 +16,112 @@
     "layouts": {
         "LAYOUT_iso_101": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0},
-                {"matrix":[0, 14], "x":14, "y":0},
-                {"matrix":[0, 15], "x":15.5, "y":0},
-                {"matrix":[0, 16], "x":16.5, "y":0},
-                {"matrix":[0, 17], "x":17.5, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v5/iso_encoder/info.json b/keyboards/keychron/v5/iso_encoder/info.json
index e15360af0f..1c650cdf50 100644
--- a/keyboards/keychron/v5/iso_encoder/info.json
+++ b/keyboards/keychron/v5/iso_encoder/info.json
@@ -21,110 +21,110 @@
     "layouts": {
         "LAYOUT_iso_99": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 7], "x":6.5, "y":0},
-                {"matrix":[0, 8], "x":7.5, "y":0},
-                {"matrix":[0, 9], "x":8.5, "y":0},
-                {"matrix":[0, 10], "x":9.5, "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":[0, 15], "x":15.25, "y":0},
-                {"matrix":[0, 16], "x":16.25, "y":0},
-                {"matrix":[0, 17], "x":17.25, "y":0},
-                {"matrix":[3, 12], "x":18.5, "y":0},
+                {"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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [0, 17], "x": 17.25, "y": 0},
+                {"matrix": [3, 12], "x": 18.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1, 15], "x":15.5, "y":1.25},
-                {"matrix":[1, 16], "x":16.5, "y":1.25},
-                {"matrix":[1, 17], "x":17.5, "y":1.25},
-                {"matrix":[3, 14], "x":18.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [1, 15], "x": 15.5, "y": 1.25},
+                {"matrix": [1, 16], "x": 16.5, "y": 1.25},
+                {"matrix": [1, 17], "x": 17.5, "y": 1.25},
+                {"matrix": [3, 14], "x": 18.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 15], "x":15.5, "y":2.25},
-                {"matrix":[2, 16], "x":16.5, "y":2.25},
-                {"matrix":[2, 17], "x":17.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 15], "x": 15.5, "y": 2.25},
+                {"matrix": [2, 16], "x": 16.5, "y": 2.25},
+                {"matrix": [2, 17], "x": 17.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 15], "x":15.5, "y":3.25},
-                {"matrix":[3, 16], "x":16.5, "y":3.25},
-                {"matrix":[3, 17], "x":17.5, "y":3.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.5, "y": 3.25},
+                {"matrix": [3, 17], "x": 17.5, "y": 3.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75},
-                {"matrix":[4, 14], "x":14.25, "y":4.5},
-                {"matrix":[4, 15], "x":15.5, "y":4.25},
-                {"matrix":[4, 16], "x":16.5, "y":4.25},
-                {"matrix":[4, 17], "x":17.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25},
+                {"matrix": [4, 17], "x": 17.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25},
-                {"matrix":[5, 11], "x":11, "y":5.25},
-                {"matrix":[5, 12], "x":12, "y":5.25},
-                {"matrix":[5, 13], "x":13.25, "y":5.5},
-                {"matrix":[5, 14], "x":14.25, "y":5.5},
-                {"matrix":[5, 15], "x":15.25, "y":5.5},
-                {"matrix":[5, 16], "x":16.5, "y":5.25},
-                {"matrix":[5, 17], "x":17.5, "y":5.25},
-                {"matrix":[5, 5], "x":18.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25},
+                {"matrix": [5, 11], "x": 11, "y": 5.25},
+                {"matrix": [5, 12], "x": 12, "y": 5.25},
+                {"matrix": [5, 13], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 16.5, "y": 5.25},
+                {"matrix": [5, 17], "x": 17.5, "y": 5.25},
+                {"matrix": [5, 5], "x": 18.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v6/ansi/info.json b/keyboards/keychron/v6/ansi/info.json
index 436cd30a78..3c1a0eb817 100644
--- a/keyboards/keychron/v6/ansi/info.json
+++ b/keyboards/keychron/v6/ansi/info.json
@@ -16,119 +16,119 @@
     "layouts": {
         "LAYOUT_ansi_108": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[2, 16], "x":17.25, "y":2.25},
-                {"matrix":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v6/ansi_encoder/info.json b/keyboards/keychron/v6/ansi_encoder/info.json
index a2cf5bdd76..4f14dea8ca 100644
--- a/keyboards/keychron/v6/ansi_encoder/info.json
+++ b/keyboards/keychron/v6/ansi_encoder/info.json
@@ -21,120 +21,120 @@
     "layouts": {
         "LAYOUT_ansi_109": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[4, 19], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"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": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2, 14], "x":15.25, "y":2.25},
-                {"matrix":[2, 15], "x":16.25, "y":2.25},
-                {"matrix":[2, 16], "x":17.25, "y":2.25},
-                {"matrix":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v6/iso/info.json b/keyboards/keychron/v6/iso/info.json
index 381754c706..adbebecda6 100644
--- a/keyboards/keychron/v6/iso/info.json
+++ b/keyboards/keychron/v6/iso/info.json
@@ -16,120 +16,120 @@
     "layouts": {
         "LAYOUT_iso_109": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[0, 2], "x":3, "y":0},
-                {"matrix":[0, 3], "x":4, "y":0},
-                {"matrix":[0, 4], "x":5, "y":0},
-                {"matrix":[0, 5], "x":6.5, "y":0},
-                {"matrix":[0, 6], "x":7.5, "y":0},
-                {"matrix":[0, 7], "x":8.5, "y":0},
-                {"matrix":[0, 8], "x":9.5, "y":0},
-                {"matrix":[0, 9], "x":11, "y":0},
-                {"matrix":[0, 10], "x":12, "y":0},
-                {"matrix":[0, 11], "x":13, "y":0},
-                {"matrix":[0, 12], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 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":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 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": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v6/iso_encoder/info.json b/keyboards/keychron/v6/iso_encoder/info.json
index f5048e25ad..177c48b912 100644
--- a/keyboards/keychron/v6/iso_encoder/info.json
+++ b/keyboards/keychron/v6/iso_encoder/info.json
@@ -21,121 +21,121 @@
     "layouts": {
         "LAYOUT_iso_110": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0, 10], "x":10.75, "y":0},
-                {"matrix":[0, 11], "x":11.75, "y":0},
-                {"matrix":[0, 12], "x":12.75, "y":0},
-                {"matrix":[4, 19], "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":[0, 19], "x":18.5, "y":0},
-                {"matrix":[1, 19], "x":19.5, "y":0},
-                {"matrix":[2, 19], "x":20.5, "y":0},
-                {"matrix":[3, 19], "x":21.5, "y":0},
+                {"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": [4, 19], "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": [0, 19], "x": 18.5, "y": 0},
+                {"matrix": [1, 19], "x": 19.5, "y": 0},
+                {"matrix": [2, 19], "x": 20.5, "y": 0},
+                {"matrix": [3, 19], "x": 21.5, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1, 10], "x":10, "y":1.25},
-                {"matrix":[1, 11], "x":11, "y":1.25},
-                {"matrix":[1, 12], "x":12, "y":1.25},
-                {"matrix":[1, 13], "x":13, "y":1.25, "w":2},
-                {"matrix":[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":[1, 17], "x":18.5, "y":1.25},
-                {"matrix":[1, 18], "x":19.5, "y":1.25},
-                {"matrix":[0, 17], "x":20.5, "y":1.25},
-                {"matrix":[0, 18], "x":21.5, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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": [1, 17], "x": 18.5, "y": 1.25},
+                {"matrix": [1, 18], "x": 19.5, "y": 1.25},
+                {"matrix": [0, 17], "x": 20.5, "y": 1.25},
+                {"matrix": [0, 18], "x": 21.5, "y": 1.25},
 
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2, 10], "x":10.5, "y":2.25},
-                {"matrix":[2, 11], "x":11.5, "y":2.25},
-                {"matrix":[2, 12], "x":12.5, "y":2.25},
-                {"matrix":[2, 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":[2, 17], "x":18.5, "y":2.25},
-                {"matrix":[2, 18], "x":19.5, "y":2.25},
-                {"matrix":[3, 14], "x":20.5, "y":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 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": [2, 17], "x": 18.5, "y": 2.25},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.25},
+                {"matrix": [3, 14], "x": 20.5, "y": 2.25},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3, 10], "x":10.75, "y":3.25},
-                {"matrix":[3, 11], "x":11.75, "y":3.25},
-                {"matrix":[3, 13], "x":12.75, "y":3.25},
-                {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"matrix":[3, 17], "x":18.5, "y":3.25},
-                {"matrix":[3, 18], "x":19.5, "y":3.25},
-                {"matrix":[3, 16], "x":20.5, "y":3.25},
-                {"matrix":[3, 15], "x":21.5, "y":2.25, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25},
+                {"matrix": [2, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.25},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.5, "y": 3.25},
+                {"matrix": [3, 15], "x": 21.5, "y": 2.25, "h": 2},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4, 10], "x":10.25, "y":4.25},
-                {"matrix":[4, 11], "x":11.25, "y":4.25},
-                {"matrix":[4, 13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4, 15], "x":16.25, "y":4.25},
-                {"matrix":[4, 17], "x":18.5, "y":4.25},
-                {"matrix":[4, 18], "x":19.5, "y":4.25},
-                {"matrix":[4, 14], "x":20.5, "y":4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.25},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.25},
+                {"matrix": [4, 14], "x": 20.5, "y": 4.25},
 
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5, 10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5, 11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5, 14], "x":15.25, "y":5.25},
-                {"matrix":[5, 15], "x":16.25, "y":5.25},
-                {"matrix":[5, 16], "x":17.25, "y":5.25},
-                {"matrix":[5, 17], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5, 18], "x":20.5, "y":5.25},
-                {"matrix":[4, 16], "x":21.5, "y":4.25, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.25, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.25},
+                {"matrix": [4, 16], "x": 21.5, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/keychron/v7/ansi/info.json b/keyboards/keychron/v7/ansi/info.json
index ba799b0ed8..6e831d2607 100644
--- a/keyboards/keychron/v7/ansi/info.json
+++ b/keyboards/keychron/v7/ansi/info.json
@@ -21,82 +21,82 @@
     "layouts": {
         "LAYOUT_ansi_72": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
-                {"matrix":[0, 14], "x":15, "y":0},
-                {"matrix":[0, 15], "x":16, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 13], "x":13.5, "y":1, "w":1.5},
-                {"matrix":[1, 14], "x":15, "y":1},
-                {"matrix":[1, 15], "x":16, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2, "w":2.25},
-                {"matrix":[2, 14], "x":15, "y":2},
-                {"matrix":[2, 15], "x":16, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
-                {"matrix":[3, 14], "x":15, "y":3},
-                {"matrix":[3, 15], "x":16, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":4},
-                {"matrix":[4, 10], "x":11, "y":4},
-                {"matrix":[4, 11], "x":12, "y":4},
-                {"matrix":[4, 12], "x":13, "y":4},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
-                {"matrix":[4, 15], "x":16, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keychron/v7/iso/info.json b/keyboards/keychron/v7/iso/info.json
index 99883b225c..d3ae4f75e5 100644
--- a/keyboards/keychron/v7/iso/info.json
+++ b/keyboards/keychron/v7/iso/info.json
@@ -21,83 +21,83 @@
     "layouts": {
         "LAYOUT_iso_73": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[0, 6], "x":6, "y":0},
-                {"matrix":[0, 7], "x":7, "y":0},
-                {"matrix":[0, 8], "x":8, "y":0},
-                {"matrix":[0, 9], "x":9, "y":0},
-                {"matrix":[0, 10], "x":10, "y":0},
-                {"matrix":[0, 11], "x":11, "y":0},
-                {"matrix":[0, 12], "x":12, "y":0},
-                {"matrix":[0, 13], "x":13, "y":0, "w":2},
-                {"matrix":[0, 14], "x":15, "y":0},
-                {"matrix":[0, 15], "x":16, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15, "y": 0},
+                {"matrix": [0, 15], "x": 16, "y": 0},
 
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[1, 6], "x":6.5, "y":1},
-                {"matrix":[1, 7], "x":7.5, "y":1},
-                {"matrix":[1, 8], "x":8.5, "y":1},
-                {"matrix":[1, 9], "x":9.5, "y":1},
-                {"matrix":[1, 10], "x":10.5, "y":1},
-                {"matrix":[1, 11], "x":11.5, "y":1},
-                {"matrix":[1, 12], "x":12.5, "y":1},
-                {"matrix":[1, 14], "x":15, "y":1},
-                {"matrix":[1, 15], "x":16, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
 
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[2, 6], "x":6.75, "y":2},
-                {"matrix":[2, 7], "x":7.75, "y":2},
-                {"matrix":[2, 8], "x":8.75, "y":2},
-                {"matrix":[2, 9], "x":9.75, "y":2},
-                {"matrix":[2, 10], "x":10.75, "y":2},
-                {"matrix":[2, 11], "x":11.75, "y":2},
-                {"matrix":[2, 13], "x":12.75, "y":2},
-                {"matrix":[1, 13], "x":13.75, "y":1, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":15, "y":2},
-                {"matrix":[2, 15], "x":16, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2},
+                {"matrix": [2, 15], "x": 16, "y": 2},
 
-                {"matrix":[3, 0], "x":0, "y":3, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3},
-                {"matrix":[3, 2], "x":2.25, "y":3},
-                {"matrix":[3, 3], "x":3.25, "y":3},
-                {"matrix":[3, 4], "x":4.25, "y":3},
-                {"matrix":[3, 5], "x":5.25, "y":3},
-                {"matrix":[3, 6], "x":6.25, "y":3},
-                {"matrix":[3, 7], "x":7.25, "y":3},
-                {"matrix":[3, 8], "x":8.25, "y":3},
-                {"matrix":[3, 9], "x":9.25, "y":3},
-                {"matrix":[3, 10], "x":10.25, "y":3},
-                {"matrix":[3, 11], "x":11.25, "y":3},
-                {"matrix":[3, 13], "x":12.25, "y":3, "w":2.75},
-                {"matrix":[3, 14], "x":15, "y":3},
-                {"matrix":[3, 15], "x":16, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+                {"matrix": [3, 14], "x": 15, "y": 3},
+                {"matrix": [3, 15], "x": 16, "y": 3},
 
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 6], "x":3.75, "y":4, "w":6.25},
-                {"matrix":[4, 9], "x":10, "y":4},
-                {"matrix":[4, 10], "x":11, "y":4},
-                {"matrix":[4, 11], "x":12, "y":4},
-                {"matrix":[4, 12], "x":13, "y":4},
-                {"matrix":[4, 13], "x":14, "y":4},
-                {"matrix":[4, 14], "x":15, "y":4},
-                {"matrix":[4, 15], "x":16, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4},
+                {"matrix": [4, 15], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json
index 3c2538aad9..38e8be2c00 100644
--- a/keyboards/keychron/v8/ansi/info.json
+++ b/keyboards/keychron/v8/ansi/info.json
@@ -21,79 +21,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index 7104a56169..c2325070aa 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -26,79 +26,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json
index 2a41cb64fb..585dcc979c 100644
--- a/keyboards/keychron/v8/iso/info.json
+++ b/keyboards/keychron/v8/iso/info.json
@@ -21,80 +21,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":9.25, "y":2.25},
-                {"matrix":[2, 7], "x":10.25, "y":2.25},
-                {"matrix":[2, 8], "x":11.25, "y":2.25},
-                {"matrix":[2, 9], "x":12.25, "y":2.25},
-                {"matrix":[2, 10], "x":13.5, "y":2.25},
-                {"matrix":[2, 11], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index faede3c5f7..a0ddfcbeea 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -26,80 +26,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 6], "x":9.25, "y":2.25},
-                {"matrix":[2, 7], "x":10.25, "y":2.25},
-                {"matrix":[2, 8], "x":11.25, "y":2.25},
-                {"matrix":[2, 9], "x":12.25, "y":2.25},
-                {"matrix":[2, 10], "x":13.5, "y":2.25},
-                {"matrix":[2, 11], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 7], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index f97bb69710..0271714822 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -29,11 +29,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         }
     }
diff --git a/keyboards/kuro/kuro65/info.json b/keyboards/kuro/kuro65/info.json
index 3217dec71f..c5006c96a9 100644
--- a/keyboards/kuro/kuro65/info.json
+++ b/keyboards/kuro/kuro65/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Kuro65",
     "manufacturer": "Kuro",
-    "maintainer" : "0x544D",
+    "maintainer": "0x544D",
     "url": "",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
@@ -38,154 +38,154 @@
     "layouts": {
         "LAYOUT_65_iso": {
             "layout": [
-                { "matrix": [0, 0], "label":"Esc", "x": 0, "y": 0},
-                { "matrix": [0, 1], "label":"1", "x": 1, "y": 0},
-                { "matrix": [0, 2], "label":"2", "x": 2, "y": 0},
-                { "matrix": [0, 3], "label":"3", "x": 3, "y": 0},
-                { "matrix": [0, 4], "label":"4", "x": 4, "y": 0},
-                { "matrix": [0, 5], "label":"5", "x": 5, "y": 0},
-                { "matrix": [0, 6], "label":"6", "x": 6, "y": 0},
-                { "matrix": [0, 7], "label":"7", "x": 7, "y": 0},
-                { "matrix": [0, 8], "label":"8", "x": 8, "y": 0},
-                { "matrix": [0, 9], "label":"9", "x": 9, "y": 0},
-                { "matrix": [0, 10], "label":"0", "x": 10, "y": 0},
-                { "matrix": [0, 11], "label":"?", "x": 11, "y": 0},
-                { "matrix": [0, 12], "label":"`", "x": 12, "y": 0},
-                { "matrix": [0, 14], "label":"Backspace", "x": 13, "y": 0, "w":2},
-                { "matrix": [0, 15], "label":"Del", "x": 15, "y": 0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "1", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "2", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "3", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "4", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "5", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "6", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "7", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "8", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "9", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "0", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "?", "x": 11, "y": 0},
+                {"matrix": [0, 12], "label": "`", "x": 12, "y": 0},
+                {"matrix": [0, 14], "label": "Backspace", "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "label": "Del", "x": 15, "y": 0},
 
-                { "matrix": [1, 0], "label":"Tab", "x": 0, "y": 1, "w":1.5},
-                { "matrix": [1, 1], "label":"Q", "x": 1.5, "y": 1},
-                { "matrix": [1, 2], "label":"W", "x": 2.5, "y": 1},
-                { "matrix": [1, 3], "label":"E", "x": 3.5, "y": 1},
-                { "matrix": [1, 4], "label":"R", "x": 4.5, "y": 1},
-                { "matrix": [1, 5], "label":"T", "x": 5.5, "y": 1},
-                { "matrix": [1, 6], "label":"Z", "x": 6.5, "y": 1},
-                { "matrix": [1, 7], "label":"U", "x": 7.5, "y": 1},
-                { "matrix": [1, 8], "label":"I", "x": 8.5, "y": 1},
-                { "matrix": [1, 9], "label":"O", "x": 9.5, "y": 1},
-                { "matrix": [1, 10], "label":"P", "x": 10.5, "y": 1},
-                { "matrix": [1, 11], "label":"Ü", "x": 11.5, "y": 1},
-                { "matrix": [1, 12], "label":"*", "x": 12.5, "y": 1},
-                { "matrix": [1, 15], "label":"Page Up", "x": 15, "y": 1},
+                {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "label": "Q", "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "label": "W", "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "label": "E", "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "label": "R", "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "label": "T", "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "label": "Z", "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "label": "U", "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "label": "I", "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "label": "O", "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "label": "P", "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "label": "Ü", "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "label": "*", "x": 12.5, "y": 1},
+                {"matrix": [1, 15], "label": "Page Up", "x": 15, "y": 1},
 
-                { "matrix": [2, 0], "label":"Caps Lock", "x": 0, "y": 2, "w":1.75},
-                { "matrix": [2, 1], "label":"A", "x": 1.75, "y": 2},
-                { "matrix": [2, 2], "label":"S", "x": 2.75, "y": 2},
-                { "matrix": [2, 3], "label":"D", "x": 3.75, "y": 2},
-                { "matrix": [2, 4], "label":"F", "x": 4.75, "y": 2},
-                { "matrix": [2, 5], "label":"G", "x": 5.75, "y": 2},
-                { "matrix": [2, 6], "label":"H", "x": 6.75, "y": 2},
-                { "matrix": [2, 7], "label":"J", "x": 7.75, "y": 2},
-                { "matrix": [2, 8], "label":"K", "x": 8.75, "y": 2},
-                { "matrix": [2, 9], "label":"L", "x": 9.75, "y": 2},
-                { "matrix": [2, 10], "label":"Ö", "x": 10.75, "y": 2},
-                { "matrix": [2, 11], "label":"Ä", "x": 11.75, "y": 2},
-                { "matrix": [2, 12], "label":"'", "x": 12.75, "y": 2},
-                { "matrix": [2, 14], "label":"Enter", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                { "matrix": [2, 15], "label":"Page Down", "x": 15, "y": 2},
+                {"matrix": [2, 0], "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "label": "A", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "S", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "D", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "F", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "G", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "H", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "J", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "K", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": "L", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "Ö", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "Ä", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "'", "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [2, 15], "label": "Page Down", "x": 15, "y": 2},
 
-                { "matrix": [3, 0], "label":"LShift", "x": 0, "y": 3, "w":1.25},
-                { "matrix": [3, 1], "label":"<", "x": 1.25, "y": 3},
-                { "matrix": [3, 2], "label":"Y", "x": 2.25, "y": 3},
-                { "matrix": [3, 3], "label":"X", "x": 3.25, "y": 3},
-                { "matrix": [3, 4], "label":"C", "x": 4.25, "y": 3},
-                { "matrix": [3, 5], "label":"V", "x": 5.25, "y": 3},
-                { "matrix": [3, 6], "label":"B", "x": 6.25, "y": 3},
-                { "matrix": [3, 7], "label":"N", "x": 7.25, "y": 3},
-                { "matrix": [3, 8], "label":"M", "x": 8.25, "y": 3},
-                { "matrix": [3, 9], "label":",", "x": 9.25, "y": 3},
-                { "matrix": [3, 10], "label":".", "x": 10.25, "y": 3},
-                { "matrix": [3, 11], "label":"-", "x": 11.25, "y": 3},
-                { "matrix": [3, 12], "label":"RShift", "x": 12.25, "y": 3, "w":1.75},
-                { "matrix": [3, 14], "label":"\u2191", "x": 14, "y": 3},
-                { "matrix": [3, 15], "label":"Fn2", "x": 15, "y": 3},
+                {"matrix": [3, 0], "label": "LShift", "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "label": "<", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Y", "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "label": "X", "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "label": "C", "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "label": "V", "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "label": "B", "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "label": "N", "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "label": "M", "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "label": ",", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": ".", "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "label": "-", "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "label": "RShift", "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "label": "\u2191", "x": 14, "y": 3},
+                {"matrix": [3, 15], "label": "Fn2", "x": 15, "y": 3},
 
-                { "matrix": [4, 0], "label":"LCtrl", "x": 0, "y": 4, "w":1.25},
-                { "matrix": [4, 1], "label":"Win", "x": 1.25, "y": 4, "w":1.25},
-                { "matrix": [4, 2], "label":"LAlt", "x": 2.5, "y": 4, "w":1.25},
-                { "matrix": [4, 6], "label":"Space", "x": 3.75, "y": 4, "w":6.25},
-                { "matrix": [4, 10], "label":"RAlt", "x": 10, "y": 4},
-                { "matrix": [4, 11], "label":"Fn1", "x": 11, "y": 4},
-                { "matrix": [4, 12], "label":"RCtrl", "x": 12, "y": 4},
-                { "matrix": [4, 13], "label":"\u2190", "x": 13, "y": 4},
-                { "matrix": [4, 14], "label":"\u2193", "x": 14, "y": 4},
-                { "matrix": [4, 15], "label":"\u2192", "x": 15, "y": 4}
+                {"matrix": [4, 0], "label": "LCtrl", "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "label": "Win", "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "label": "LAlt", "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "label": "Space", "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "label": "RAlt", "x": 10, "y": 4},
+                {"matrix": [4, 11], "label": "Fn1", "x": 11, "y": 4},
+                {"matrix": [4, 12], "label": "RCtrl", "x": 12, "y": 4},
+                {"matrix": [4, 13], "label": "\u2190", "x": 13, "y": 4},
+                {"matrix": [4, 14], "label": "\u2193", "x": 14, "y": 4},
+                {"matrix": [4, 15], "label": "\u2192", "x": 15, "y": 4}
             ]
         }
     },
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
-            { "flags": 1, "matrix": [4, 10], "x":150, "y": 64},
-            { "flags": 1, "matrix": [4, 11], "x":165, "y": 64},
-            { "flags": 1, "matrix": [4, 12], "x":180, "y": 64},
-            { "flags": 4, "matrix": [4, 13], "x":195, "y": 64},
-            { "flags": 4, "matrix": [4, 14], "x":210, "y": 64},
-            { "flags": 4, "matrix": [4, 15], "x":224, "y": 64},
-            { "flags": 4, "matrix": [3, 15], "x":224, "y": 48},
-            { "flags": 4, "matrix": [3, 14], "x":210, "y": 48},
-            { "flags": 1, "matrix": [3, 12], "x":189, "y": 48},
-            { "flags": 4, "matrix": [3, 11], "x":169, "y": 48},
-            { "flags": 4, "matrix": [3, 10], "x":154, "y": 48},
-            { "flags": 4, "matrix": [3, 9], "x":139, "y": 48},
-            { "flags": 4, "matrix": [3, 8], "x":124, "y": 48},
-            { "flags": 4, "matrix": [3, 7], "x":109, "y": 48},
-            { "flags": 4, "matrix": [3, 6], "x": 94, "y": 48},
-            { "flags": 4, "matrix": [3, 5], "x": 79, "y": 48},
-            { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48},
-            { "flags": 4, "matrix": [3, 3], "x": 49, "y": 48},
-            { "flags": 4, "matrix": [3, 2], "x": 34, "y": 48},
-            { "flags": 4, "matrix": [3, 1], "x": 19, "y": 48},
-            { "flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
-            { "flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
-            { "flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
-            { "flags": 1, "matrix": [3, 0], "x": 2, "y": 48},
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
-            { "flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
-            { "flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
-            { "flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
-            { "flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
-            { "flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
-            { "flags": 4, "matrix": [2, 6], "x":101, "y": 32},
-            { "flags": 4, "matrix": [2, 7], "x":116, "y": 32},
-            { "flags": 4, "matrix": [2, 8], "x":131, "y": 32},
-            { "flags": 4, "matrix": [2, 9], "x":146, "y": 32},
-            { "flags": 4, "matrix": [2, 10], "x":161, "y": 32},
-            { "flags": 4, "matrix": [2, 11], "x":176, "y": 32},
-            { "flags": 4, "matrix": [2, 12], "x":191, "y": 32},
-            { "flags": 4, "matrix": [2, 14], "x":208, "y": 24},
-            { "flags": 4, "matrix": [2, 15], "x":224, "y": 32},
-            { "flags": 4, "matrix": [1, 15], "x":224, "y": 16},
-            { "flags": 4, "matrix": [1, 12], "x":188, "y": 16},
-            { "flags": 4, "matrix": [1, 11], "x":173, "y": 16},
-            { "flags": 4, "matrix": [1, 10], "x":158, "y": 16},
-            { "flags": 4, "matrix": [1, 9], "x":143, "y": 16},
-            { "flags": 4, "matrix": [1, 8], "x":128, "y": 16},
-            { "flags": 4, "matrix": [1, 7], "x":113, "y": 16},
-            { "flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
-            { "flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
-            { "flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
-            { "flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
-            { "flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
-            { "flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
-            { "flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
-            { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
-            { "flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
-            { "flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
-            { "flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
-            { "flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
-            { "flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
-            { "flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
-            { "flags": 4, "matrix": [0, 7], "x":105, "y": 0},
-            { "flags": 4, "matrix": [0, 8], "x":120, "y": 0},
-            { "flags": 4, "matrix": [0, 9], "x":135, "y": 0},
-            { "flags": 4, "matrix": [0, 10], "x":150, "y": 0},
-            { "flags": 4, "matrix": [0, 11], "x":165, "y": 0},
-            { "flags": 4, "matrix": [0, 12], "x":180, "y": 0},
-            { "flags": 4, "matrix": [0, 14], "x":203, "y": 0},
-            { "flags": 4, "matrix": [0, 15], "x":224, "y": 0}
+            {"flags": 4, "matrix": [4, 6], "x": 96, "y": 64},
+            {"flags": 1, "matrix": [4, 10], "x": 150, "y": 64},
+            {"flags": 1, "matrix": [4, 11], "x": 165, "y": 64},
+            {"flags": 1, "matrix": [4, 12], "x": 180, "y": 64},
+            {"flags": 4, "matrix": [4, 13], "x": 195, "y": 64},
+            {"flags": 4, "matrix": [4, 14], "x": 210, "y": 64},
+            {"flags": 4, "matrix": [4, 15], "x": 224, "y": 64},
+            {"flags": 4, "matrix": [3, 15], "x": 224, "y": 48},
+            {"flags": 4, "matrix": [3, 14], "x": 210, "y": 48},
+            {"flags": 1, "matrix": [3, 12], "x": 189, "y": 48},
+            {"flags": 4, "matrix": [3, 11], "x": 169, "y": 48},
+            {"flags": 4, "matrix": [3, 10], "x": 154, "y": 48},
+            {"flags": 4, "matrix": [3, 9], "x": 139, "y": 48},
+            {"flags": 4, "matrix": [3, 8], "x": 124, "y": 48},
+            {"flags": 4, "matrix": [3, 7], "x": 109, "y": 48},
+            {"flags": 4, "matrix": [3, 6], "x": 94, "y": 48},
+            {"flags": 4, "matrix": [3, 5], "x": 79, "y": 48},
+            {"flags": 4, "matrix": [3, 4], "x": 64, "y": 48},
+            {"flags": 4, "matrix": [3, 3], "x": 49, "y": 48},
+            {"flags": 4, "matrix": [3, 2], "x": 34, "y": 48},
+            {"flags": 4, "matrix": [3, 1], "x": 19, "y": 48},
+            {"flags": 1, "matrix": [4, 2], "x": 39, "y": 64},
+            {"flags": 1, "matrix": [4, 1], "x": 21, "y": 64},
+            {"flags": 1, "matrix": [4, 0], "x": 2, "y": 64},
+            {"flags": 1, "matrix": [3, 0], "x": 2, "y": 48},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 26, "y": 32},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 3], "x": 56, "y": 32},
+            {"flags": 4, "matrix": [2, 4], "x": 71, "y": 32},
+            {"flags": 4, "matrix": [2, 5], "x": 86, "y": 32},
+            {"flags": 4, "matrix": [2, 6], "x": 101, "y": 32},
+            {"flags": 4, "matrix": [2, 7], "x": 116, "y": 32},
+            {"flags": 4, "matrix": [2, 8], "x": 131, "y": 32},
+            {"flags": 4, "matrix": [2, 9], "x": 146, "y": 32},
+            {"flags": 4, "matrix": [2, 10], "x": 161, "y": 32},
+            {"flags": 4, "matrix": [2, 11], "x": 176, "y": 32},
+            {"flags": 4, "matrix": [2, 12], "x": 191, "y": 32},
+            {"flags": 4, "matrix": [2, 14], "x": 208, "y": 24},
+            {"flags": 4, "matrix": [2, 15], "x": 224, "y": 32},
+            {"flags": 4, "matrix": [1, 15], "x": 224, "y": 16},
+            {"flags": 4, "matrix": [1, 12], "x": 188, "y": 16},
+            {"flags": 4, "matrix": [1, 11], "x": 173, "y": 16},
+            {"flags": 4, "matrix": [1, 10], "x": 158, "y": 16},
+            {"flags": 4, "matrix": [1, 9], "x": 143, "y": 16},
+            {"flags": 4, "matrix": [1, 8], "x": 128, "y": 16},
+            {"flags": 4, "matrix": [1, 7], "x": 113, "y": 16},
+            {"flags": 4, "matrix": [1, 6], "x": 98, "y": 16},
+            {"flags": 4, "matrix": [1, 5], "x": 83, "y": 16},
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 16},
+            {"flags": 4, "matrix": [1, 3], "x": 53, "y": 16},
+            {"flags": 4, "matrix": [1, 2], "x": 38, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 23, "y": 16},
+            {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+            {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 15, "y": 0},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 4, "matrix": [0, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [0, 4], "x": 60, "y": 0},
+            {"flags": 4, "matrix": [0, 5], "x": 75, "y": 0},
+            {"flags": 4, "matrix": [0, 6], "x": 90, "y": 0},
+            {"flags": 4, "matrix": [0, 7], "x": 105, "y": 0},
+            {"flags": 4, "matrix": [0, 8], "x": 120, "y": 0},
+            {"flags": 4, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 4, "matrix": [0, 10], "x": 150, "y": 0},
+            {"flags": 4, "matrix": [0, 11], "x": 165, "y": 0},
+            {"flags": 4, "matrix": [0, 12], "x": 180, "y": 0},
+            {"flags": 4, "matrix": [0, 14], "x": 203, "y": 0},
+            {"flags": 4, "matrix": [0, 15], "x": 224, "y": 0}
         ]
     }
 }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/info.json b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
index ed2219805a..65e559b252 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev1/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/info.json
@@ -6,52 +6,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
 
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
-                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
-                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
             ]
         }
     }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/info.json b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
index 7fe8c59ccb..5109d49d3c 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev2/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/info.json
@@ -2,52 +2,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
 
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
-                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
-                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
             ]
         }
     }
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
index b1a3dbf19b..332a554610 100644
--- a/keyboards/lazydesigners/dimple/staggered/rev3/info.json
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
@@ -5,148 +5,148 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
 
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
-                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
-                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":0, "w":1.25, "h":2, "matrix": [1, 11]},
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 0, "w": 1.25, "h": 2, "matrix": [1, 11]},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
 
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Alt", "x":2.75, "y":3, "matrix": [3, 3]},
-                {"label":"Space", "x":3.75, "y":3, "w":2.25, "matrix": [3, 4]},
-                {"label":"Space", "x":6, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"label":"Left", "x":8.75, "y":3, "matrix": [3, 7]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Alt", "x": 2.75, "y": 3, "matrix": [3, 3]},
+                {"label": "Space", "x": 3.75, "y": 3, "w": 2.25, "matrix": [3, 4]},
+                {"label": "Space", "x": 6, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"label": "Left", "x": 8.75, "y": 3, "matrix": [3, 7]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
             ]
         },
         "LAYOUT_7u": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"Q", "x":1, "y":0, "matrix": [0, 1]},
-                {"label":"W", "x":2, "y":0, "matrix": [0, 2]},
-                {"label":"E", "x":3, "y":0, "matrix": [0, 3]},
-                {"label":"R", "x":4, "y":0, "matrix": [0, 4]},
-                {"label":"T", "x":5, "y":0, "matrix": [0, 5]},
-                {"label":"Y", "x":6, "y":0, "matrix": [0, 6]},
-                {"label":"U", "x":7, "y":0, "matrix": [0, 7]},
-                {"label":"I", "x":8, "y":0, "matrix": [0, 8]},
-                {"label":"O", "x":9, "y":0, "matrix": [0, 9]},
-                {"label":"P", "x":10, "y":0, "matrix": [0, 10]},
-                {"label":"Back<br>Space", "x":11, "y":0, "w":1.5, "matrix": [0, 11]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "Q", "x": 1, "y": 0, "matrix": [0, 1]},
+                {"label": "W", "x": 2, "y": 0, "matrix": [0, 2]},
+                {"label": "E", "x": 3, "y": 0, "matrix": [0, 3]},
+                {"label": "R", "x": 4, "y": 0, "matrix": [0, 4]},
+                {"label": "T", "x": 5, "y": 0, "matrix": [0, 5]},
+                {"label": "Y", "x": 6, "y": 0, "matrix": [0, 6]},
+                {"label": "U", "x": 7, "y": 0, "matrix": [0, 7]},
+                {"label": "I", "x": 8, "y": 0, "matrix": [0, 8]},
+                {"label": "O", "x": 9, "y": 0, "matrix": [0, 9]},
+                {"label": "P", "x": 10, "y": 0, "matrix": [0, 10]},
+                {"label": "Back<br>Space", "x": 11, "y": 0, "w": 1.5, "matrix": [0, 11]},
 
-                {"label":"Tab", "x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"label":"A", "x":1.25, "y":1, "matrix": [1, 1]},
-                {"label":"S", "x":2.25, "y":1, "matrix": [1, 2]},
-                {"label":"D", "x":3.25, "y":1, "matrix": [1, 3]},
-                {"label":"F", "x":4.25, "y":1, "matrix": [1, 4]},
-                {"label":"G", "x":5.25, "y":1, "matrix": [1, 5]},
-                {"label":"H", "x":6.25, "y":1, "matrix": [1, 6]},
-                {"label":"J", "x":7.25, "y":1, "matrix": [1, 7]},
-                {"label":"K", "x":8.25, "y":1, "matrix": [1, 8]},
-                {"label":"L", "x":9.25, "y":1, "matrix": [1, 9]},
-                {"label":"'", "x":10.25, "y":1, "matrix": [1, 10]},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.25, "matrix": [1, 11]},
+                {"label": "Tab", "x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"label": "A", "x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"label": "S", "x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"label": "D", "x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"label": "F", "x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"label": "G", "x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"label": "H", "x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"label": "J", "x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"label": "K", "x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"label": "L", "x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"label": "'", "x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"label": "Enter", "x": 11.25, "y": 1, "w": 1.25, "matrix": [1, 11]},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"label":"Z", "x":1.75, "y":2, "matrix": [2, 1]},
-                {"label":"X", "x":2.75, "y":2, "matrix": [2, 2]},
-                {"label":"C", "x":3.75, "y":2, "matrix": [2, 3]},
-                {"label":"V", "x":4.75, "y":2, "matrix": [2, 4]},
-                {"label":"B", "x":5.75, "y":2, "matrix": [2, 5]},
-                {"label":"N", "x":6.75, "y":2, "matrix": [2, 6]},
-                {"label":"M", "x":7.75, "y":2, "matrix": [2, 7]},
-                {"label":",", "x":8.75, "y":2, "matrix": [2, 8]},
-                {"label":"Up", "x":9.75, "y":2, "matrix": [2, 9]},
-                {"label":".", "x":10.75, "y":2, "w":1.75, "matrix": [2, 10]},
+                {"label": "Shift", "x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"label": "Z", "x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"label": "X", "x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"label": "C", "x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"label": "V", "x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"label": "B", "x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"label": "N", "x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"label": "M", "x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"label": ",", "x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"label": "Up", "x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"label": ".", "x": 10.75, "y": 2, "w": 1.75, "matrix": [2, 10]},
 
-                {"label":"Ctrl", "x":0.75, "y":3, "matrix": [3, 0]},
-                {"label":"Gui", "x":1.75, "y":3, "matrix": [3, 2]},
-                {"label":"Space", "x":2.75, "y":3, "w":7, "matrix": [3, 4]},
-                {"label":"Down", "x":9.75, "y":3, "matrix": [3, 8]},
-                {"label":"Right", "x":10.75, "y":3, "matrix": [3, 9]}
+                {"label": "Ctrl", "x": 0.75, "y": 3, "matrix": [3, 0]},
+                {"label": "Gui", "x": 1.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Space", "x": 2.75, "y": 3, "w": 7, "matrix": [3, 4]},
+                {"label": "Down", "x": 9.75, "y": 3, "matrix": [3, 8]},
+                {"label": "Right", "x": 10.75, "y": 3, "matrix": [3, 9]}
             ]
         }
     }
diff --git a/keyboards/leafcutterlabs/bigknob/info.json b/keyboards/leafcutterlabs/bigknob/info.json
index bce699e5c7..1361138549 100644
--- a/keyboards/leafcutterlabs/bigknob/info.json
+++ b/keyboards/leafcutterlabs/bigknob/info.json
@@ -29,11 +29,11 @@
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":4, "y":0, "matrix": [0, 4]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 4, "y": 0, "matrix": [0, 4]}
       ]
     }
   }
diff --git a/keyboards/lily58/r2g/info.json b/keyboards/lily58/r2g/info.json
index ebdc386450..47d989278a 100644
--- a/keyboards/lily58/r2g/info.json
+++ b/keyboards/lily58/r2g/info.json
@@ -30,11 +30,73 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0.5}, {"matrix": [0, 1], "x":1, "y":0.375}, {"matrix": [0, 2], "x":2, "y":0.125}, {"matrix": [0, 3], "x":3,  "y":0},    {"matrix": [0, 4], "x":4, "y":0.125}, {"matrix": [0, 5], "x":5, "y":0.25},                                                                                               {"matrix": [5, 5], "x":10.5, "y":0.25}, {"matrix": [5, 4], "x":11.5, "y":0.125}, {"matrix": [5, 3], "x":12.5, "y":0}, {"matrix": [5, 2], "x":13.5, "y":0.125}, {"matrix": [5, 1], "x":14.5, "y":0.375}, {"matrix": [5, 0], "x":15.5, "y":0.5},
-                {"matrix": [1, 0], "x":0, "y":1.5}, {"matrix": [1, 1], "x":1, "y":1.375}, {"matrix": [1, 2], "x":2, "y":1.125}, {"matrix": [1, 3], "x":3,  "y":1},    {"matrix": [1, 4], "x":4, "y":1.125}, {"matrix": [1, 5], "x":5, "y":1.25},                                                                                               {"matrix": [6, 5], "x":10.5, "y":1.25}, {"matrix": [6, 4], "x":11.5, "y":1.125}, {"matrix": [6, 3], "x":12.5, "y":1}, {"matrix": [6, 2], "x":13.5, "y":1.125}, {"matrix": [6, 1], "x":14.5, "y":1.375}, {"matrix": [6, 0], "x":15.5, "y":1.5},
-                {"matrix": [2, 0], "x":0, "y":2.5}, {"matrix": [2, 1], "x":1, "y":2.375}, {"matrix": [2, 2], "x":2, "y":2.125}, {"matrix": [2, 3], "x":3,  "y":2},    {"matrix": [2, 4], "x":4, "y":2.125}, {"matrix": [2, 5], "x":5, "y":2.25},                                                                                               {"matrix": [7, 5], "x":10.5, "y":2.25}, {"matrix": [7, 4], "x":11.5, "y":2.125}, {"matrix": [7, 3], "x":12.5, "y":2}, {"matrix": [7, 2], "x":13.5, "y":2.125}, {"matrix": [7, 1], "x":14.5, "y":2.375}, {"matrix": [7, 0], "x":15.5, "y":2.5},
-                {"matrix": [3, 0], "x":0, "y":3.5}, {"matrix": [3, 1], "x":1, "y":3.375}, {"matrix": [3, 2], "x":2, "y":3.125}, {"matrix": [3, 3], "x":3,  "y":3},    {"matrix": [3, 4], "x":4, "y":3.125}, {"matrix": [3, 5], "x":5, "y":3.25}, {"matrix": [4, 5], "x":6, "y":2.75},                   {"matrix": [9, 5], "x":9.5, "y":2.75}, {"matrix": [8, 5], "x":10.5, "y":3.25}, {"matrix": [8, 4], "x":11.5, "y":3.125}, {"matrix": [8, 3], "x":12.5, "y":3}, {"matrix": [8, 2], "x":13.5, "y":3.125}, {"matrix": [8, 1], "x":14.5, "y":3.375}, {"matrix": [8, 0], "x":15.5, "y":3.5},
-                                                                                                                                {"matrix": [4, 1], "x":2.5,"y":4.125},{"matrix": [4, 2], "x":3.5, "y":4.15},{"matrix": [4, 3], "x":4.5,"y":4.25},{"matrix": [4, 4], "x":6, "y":4.25, "h":1.5}, {"matrix": [9, 4], "x":9.5, "y":4.25, "h":1.5}, {"matrix": [9, 3], "x":11, "y":4.25},   {"matrix": [9, 2], "x":12, "y":4.15},    {"matrix": [9, 1], "x":13, "y":4.15}
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.375},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+
+                {"matrix": [5, 5], "x": 10.5, "y": 0.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 0.125},
+                {"matrix": [5, 3], "x": 12.5, "y": 0},
+                {"matrix": [5, 2], "x": 13.5, "y": 0.125},
+                {"matrix": [5, 1], "x": 14.5, "y": 0.375},
+                {"matrix": [5, 0], "x": 15.5, "y": 0.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.375},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+
+                {"matrix": [6, 5], "x": 10.5, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.5, "y": 1.125},
+                {"matrix": [6, 3], "x": 12.5, "y": 1},
+                {"matrix": [6, 2], "x": 13.5, "y": 1.125},
+                {"matrix": [6, 1], "x": 14.5, "y": 1.375},
+                {"matrix": [6, 0], "x": 15.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.375},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+
+                {"matrix": [7, 5], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.125},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 2], "x": 13.5, "y": 2.125},
+                {"matrix": [7, 1], "x": 14.5, "y": 2.375},
+                {"matrix": [7, 0], "x": 15.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.375},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.125},
+                {"matrix": [3, 5], "x": 5, "y": 3.25},
+                {"matrix": [4, 5], "x": 6, "y": 2.75},
+
+                {"matrix": [9, 5], "x": 9.5, "y": 2.75},
+                {"matrix": [8, 5], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.125},
+                {"matrix": [8, 3], "x": 12.5, "y": 3},
+                {"matrix": [8, 2], "x": 13.5, "y": 3.125},
+                {"matrix": [8, 1], "x": 14.5, "y": 3.375},
+                {"matrix": [8, 0], "x": 15.5, "y": 3.5},
+
+                {"matrix": [4, 1], "x": 2.5,"y": 4.125},
+                {"matrix": [4, 2], "x": 3.5, "y": 4.15},
+                {"matrix": [4, 3], "x": 4.5,"y": 4.25},
+                {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5},
+
+                {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5},
+                {"matrix": [9, 3], "x": 11, "y": 4.25},
+                {"matrix": [9, 2], "x": 12, "y": 4.15},
+                {"matrix": [9, 1], "x": 13, "y": 4.15}
             ]
         }
     },
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json
index 7d750c0e3a..cf17b94a4d 100644
--- a/keyboards/linworks/em8/info.json
+++ b/keyboards/linworks/em8/info.json
@@ -40,157 +40,157 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix":[1, 0] },
-                {"x":1.25, "y":0, "matrix":[0, 0] },
-                {"x":2.25, "y":0, "matrix":[0, 1] },
-                {"x":3.25, "y":0, "matrix":[0, 2] },
-                {"x":4.25, "y":0, "matrix":[0, 3] },
-                {"x":5.25, "y":0, "matrix":[0, 4] },
-                {"x":6.25, "y":0, "matrix":[0, 5] },
-                {"x":7.25, "y":0, "matrix":[0, 6] },
-                {"x":10.25, "y":0, "matrix":[0, 7] },
-                {"x":11.25, "y":0, "matrix":[0, 8] },
-                {"x":12.25, "y":0, "matrix":[0, 9] },
-                {"x":13.25, "y":0, "matrix":[0, 10] },
-                {"x":14.25, "y":0, "matrix":[0, 11] },
-                {"x":15.25, "y":0, "matrix":[0, 12] },
-                {"x":16.25, "y":0, "w": 2, "matrix":[0, 13] },
-                {"x":18.5, "y":0, "matrix":[0, 14] },
+                {"x": 0, "y": 0, "matrix": [1, 0]},
+                {"x": 1.25, "y": 0, "matrix": [0, 0]},
+                {"x": 2.25, "y": 0, "matrix": [0, 1]},
+                {"x": 3.25, "y": 0, "matrix": [0, 2]},
+                {"x": 4.25, "y": 0, "matrix": [0, 3]},
+                {"x": 5.25, "y": 0, "matrix": [0, 4]},
+                {"x": 6.25, "y": 0, "matrix": [0, 5]},
+                {"x": 7.25, "y": 0, "matrix": [0, 6]},
+                {"x": 10.25, "y": 0, "matrix": [0, 7]},
+                {"x": 11.25, "y": 0, "matrix": [0, 8]},
+                {"x": 12.25, "y": 0, "matrix": [0, 9]},
+                {"x": 13.25, "y": 0, "matrix": [0, 10]},
+                {"x": 14.25, "y": 0, "matrix": [0, 11]},
+                {"x": 15.25, "y": 0, "matrix": [0, 12]},
+                {"x": 16.25, "y": 0, "w": 2, "matrix": [0, 13]},
+                {"x": 18.5, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "matrix":[2, 0] },
-                {"x":1.25, "y":1, "w":1.5, "matrix":[1, 1] },
-                {"x":2.75, "y":1, "matrix":[1, 2] },
-                {"x":3.75, "y":1, "matrix":[1, 3] },
-                {"x":4.75, "y":1, "matrix":[1, 4] },
-                {"x":5.75, "y":1, "matrix":[1, 5] },
-                {"x":6.75, "y":1, "matrix":[1, 6] },
-                {"x":9.75, "y":1, "matrix":[1, 7] },
-                {"x":10.75, "y":1, "matrix":[1, 8] },
-                {"x":11.75, "y":1, "matrix":[1, 9] },
-                {"x":12.75, "y":1, "matrix":[1, 10] },
-                {"x":13.75, "y":1, "matrix":[1, 11] },
-                {"x":14.75, "y":1, "matrix":[1, 12] },
-                {"x":15.75, "y":1, "matrix":[1, 13] },
-                {"x":16.75, "y":1, "w":1.5, "matrix":[1, 14] },
-                {"x":18.5, "y":1, "matrix":[2, 14] },
+                {"x": 0, "y": 1, "matrix": [2, 0]},
+                {"x": 1.25, "y": 1, "w": 1.5, "matrix": [1, 1]},
+                {"x": 2.75, "y": 1, "matrix": [1, 2]},
+                {"x": 3.75, "y": 1, "matrix": [1, 3]},
+                {"x": 4.75, "y": 1, "matrix": [1, 4]},
+                {"x": 5.75, "y": 1, "matrix": [1, 5]},
+                {"x": 6.75, "y": 1, "matrix": [1, 6]},
+                {"x": 9.75, "y": 1, "matrix": [1, 7]},
+                {"x": 10.75, "y": 1, "matrix": [1, 8]},
+                {"x": 11.75, "y": 1, "matrix": [1, 9]},
+                {"x": 12.75, "y": 1, "matrix": [1, 10]},
+                {"x": 13.75, "y": 1, "matrix": [1, 11]},
+                {"x": 14.75, "y": 1, "matrix": [1, 12]},
+                {"x": 15.75, "y": 1, "matrix": [1, 13]},
+                {"x": 16.75, "y": 1, "w": 1.5, "matrix": [1, 14]},
+                {"x": 18.5, "y": 1, "matrix": [2, 14]},
 
-                {"x":0, "y":2, "matrix":[3, 0] },
-                {"x":1.25, "y":2, "w":1.75, "matrix":[2, 1] },
-                {"x":3, "y":2, "matrix":[2, 2] },
-                {"x":4, "y":2, "matrix":[2, 3] },
-                {"x":5, "y":2, "matrix":[2, 4] },
-                {"x":6, "y":2, "matrix":[2, 5] },
-                {"x":7, "y":2, "matrix":[2, 6] },
-                {"x":10, "y":2, "matrix":[2, 7] },
-                {"x":11, "y":2, "matrix":[2, 8] },
-                {"x":12, "y":2, "matrix":[2, 9] },
-                {"x":13, "y":2, "matrix":[2, 10] },
-                {"x":14, "y":2, "matrix":[2, 11] },
-                {"x":15, "y":2, "matrix":[2, 12] },
-                {"x":16, "y":2, "w":2.25, "matrix":[2, 13] },
+                {"x": 0, "y": 2, "matrix": [3, 0]},
+                {"x": 1.25, "y": 2, "w": 1.75, "matrix": [2, 1]},
+                {"x": 3, "y": 2, "matrix": [2, 2]},
+                {"x": 4, "y": 2, "matrix": [2, 3]},
+                {"x": 5, "y": 2, "matrix": [2, 4]},
+                {"x": 6, "y": 2, "matrix": [2, 5]},
+                {"x": 7, "y": 2, "matrix": [2, 6]},
+                {"x": 10, "y": 2, "matrix": [2, 7]},
+                {"x": 11, "y": 2, "matrix": [2, 8]},
+                {"x": 12, "y": 2, "matrix": [2, 9]},
+                {"x": 13, "y": 2, "matrix": [2, 10]},
+                {"x": 14, "y": 2, "matrix": [2, 11]},
+                {"x": 15, "y": 2, "matrix": [2, 12]},
+                {"x": 16, "y": 2, "w": 2.25, "matrix": [2, 13]},
 
-                {"x":1.25, "y":3, "w":2.25, "matrix":[3, 1] },
-                {"x":3.5, "y":3, "matrix":[3, 2] },
-                {"x":4.5, "y":3, "matrix":[3, 3] },
-                {"x":5.5, "y":3, "matrix":[3, 4] },
-                {"x":6.5, "y":3, "matrix":[3, 5] },
-                {"x":7.5, "y":3, "matrix":[3, 6] },
-                {"x":9.5, "y":3, "matrix":[3, 7] },
-                {"x":10.5, "y":3, "matrix":[3, 8] },
-                {"x":11.5, "y":3, "matrix":[3, 9] },
-                {"x":12.5, "y":3, "matrix":[3, 10] },
-                {"x":13.5, "y":3, "matrix":[3, 11] },
-                {"x":14.5, "y":3, "matrix":[3, 12] },
-                {"x":15.5, "y":3, "w":1.75, "matrix":[3, 13] },
-                {"x":17.5, "y":3.25, "matrix":[3, 14] },
+                {"x": 1.25, "y": 3, "w": 2.25, "matrix": [3, 1]},
+                {"x": 3.5, "y": 3, "matrix": [3, 2]},
+                {"x": 4.5, "y": 3, "matrix": [3, 3]},
+                {"x": 5.5, "y": 3, "matrix": [3, 4]},
+                {"x": 6.5, "y": 3, "matrix": [3, 5]},
+                {"x": 7.5, "y": 3, "matrix": [3, 6]},
+                {"x": 9.5, "y": 3, "matrix": [3, 7]},
+                {"x": 10.5, "y": 3, "matrix": [3, 8]},
+                {"x": 11.5, "y": 3, "matrix": [3, 9]},
+                {"x": 12.5, "y": 3, "matrix": [3, 10]},
+                {"x": 13.5, "y": 3, "matrix": [3, 11]},
+                {"x": 14.5, "y": 3, "matrix": [3, 12]},
+                {"x": 15.5, "y": 3, "w": 1.75, "matrix": [3, 13]},
+                {"x": 17.5, "y": 3.25, "matrix": [3, 14]},
 
-                {"x":1.25, "y":4, "w":1.5, "matrix":[4, 1] },
-                {"x":4.25, "y":4, "w":1.5, "matrix":[4, 3] },
-                {"x":5.75, "y":4, "w":2.25, "matrix":[4, 5] },
-                {"x":8, "y":4, "matrix":[4, 6] },
-                {"x":9.5, "y":4, "w":2.75, "matrix":[4, 8] },
-                {"x":12.25, "y":4, "w":1.5, "matrix":[4, 10] },
-                {"x":16.5, "y":4.25, "matrix":[4, 12] },
-                {"x":17.5, "y":4.25, "matrix":[4, 13] },
-                {"x":18.5, "y":4.25, "matrix":[4, 14] }
+                {"x": 1.25, "y": 4, "w": 1.5, "matrix": [4, 1]},
+                {"x": 4.25, "y": 4, "w": 1.5, "matrix": [4, 3]},
+                {"x": 5.75, "y": 4, "w": 2.25, "matrix": [4, 5]},
+                {"x": 8, "y": 4, "matrix": [4, 6]},
+                {"x": 9.5, "y": 4, "w": 2.75, "matrix": [4, 8]},
+                {"x": 12.25, "y": 4, "w": 1.5, "matrix": [4, 10]},
+                {"x": 16.5, "y": 4.25, "matrix": [4, 12]},
+                {"x": 17.5, "y": 4.25, "matrix": [4, 13]},
+                {"x": 18.5, "y": 4.25, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"x":0, "y":0, "matrix":[1, 0] },
-                {"x":1.25, "y":0, "matrix":[0, 0] },
-                {"x":2.25, "y":0, "matrix":[0, 1] },
-                {"x":3.25, "y":0, "matrix":[0, 2] },
-                {"x":4.25, "y":0, "matrix":[0, 3] },
-                {"x":5.25, "y":0, "matrix":[0, 4] },
-                {"x":6.25, "y":0, "matrix":[0, 5] },
-                {"x":7.25, "y":0, "matrix":[0, 6] },
-                {"x":10.25, "y":0, "matrix":[0, 7] },
-                {"x":11.25, "y":0, "matrix":[0, 8] },
-                {"x":12.25, "y":0, "matrix":[0, 9] },
-                {"x":13.25, "y":0, "matrix":[0, 10] },
-                {"x":14.25, "y":0, "matrix":[0, 11] },
-                {"x":15.25, "y":0, "matrix":[0, 12] },
-                {"x":16.25, "y":0, "matrix":[0, 13] },
-                {"x":17.25, "y":0, "matrix":[4, 11] },
-                {"x":18.5, "y":0, "matrix":[0, 14] },
+                {"x": 0, "y": 0, "matrix": [1, 0]},
+                {"x": 1.25, "y": 0, "matrix": [0, 0]},
+                {"x": 2.25, "y": 0, "matrix": [0, 1]},
+                {"x": 3.25, "y": 0, "matrix": [0, 2]},
+                {"x": 4.25, "y": 0, "matrix": [0, 3]},
+                {"x": 5.25, "y": 0, "matrix": [0, 4]},
+                {"x": 6.25, "y": 0, "matrix": [0, 5]},
+                {"x": 7.25, "y": 0, "matrix": [0, 6]},
+                {"x": 10.25, "y": 0, "matrix": [0, 7]},
+                {"x": 11.25, "y": 0, "matrix": [0, 8]},
+                {"x": 12.25, "y": 0, "matrix": [0, 9]},
+                {"x": 13.25, "y": 0, "matrix": [0, 10]},
+                {"x": 14.25, "y": 0, "matrix": [0, 11]},
+                {"x": 15.25, "y": 0, "matrix": [0, 12]},
+                {"x": 16.25, "y": 0, "matrix": [0, 13]},
+                {"x": 17.25, "y": 0, "matrix": [4, 11]},
+                {"x": 18.5, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "matrix":[2, 0] },
-                {"x":1.25, "y":1, "w":1.5, "matrix":[1, 1] },
-                {"x":2.75, "y":1, "matrix":[1, 2] },
-                {"x":3.75, "y":1, "matrix":[1, 3] },
-                {"x":4.75, "y":1, "matrix":[1, 4] },
-                {"x":5.75, "y":1, "matrix":[1, 5] },
-                {"x":6.75, "y":1, "matrix":[1, 6] },
-                {"x":9.75, "y":1, "matrix":[1, 7] },
-                {"x":10.75, "y":1, "matrix":[1, 8] },
-                {"x":11.75, "y":1, "matrix":[1, 9] },
-                {"x":12.75, "y":1, "matrix":[1, 10] },
-                {"x":13.75, "y":1, "matrix":[1, 11] },
-                {"x":14.75, "y":1, "matrix":[1, 12] },
-                {"x":15.75, "y":1, "matrix":[1, 13] },
-                {"x":16.75, "y":1, "w":1.5, "matrix":[1, 14] },
-                {"x":18.5, "y":1, "matrix":[2, 14] },
+                {"x": 0, "y": 1, "matrix": [2, 0]},
+                {"x": 1.25, "y": 1, "w": 1.5, "matrix": [1, 1]},
+                {"x": 2.75, "y": 1, "matrix": [1, 2]},
+                {"x": 3.75, "y": 1, "matrix": [1, 3]},
+                {"x": 4.75, "y": 1, "matrix": [1, 4]},
+                {"x": 5.75, "y": 1, "matrix": [1, 5]},
+                {"x": 6.75, "y": 1, "matrix": [1, 6]},
+                {"x": 9.75, "y": 1, "matrix": [1, 7]},
+                {"x": 10.75, "y": 1, "matrix": [1, 8]},
+                {"x": 11.75, "y": 1, "matrix": [1, 9]},
+                {"x": 12.75, "y": 1, "matrix": [1, 10]},
+                {"x": 13.75, "y": 1, "matrix": [1, 11]},
+                {"x": 14.75, "y": 1, "matrix": [1, 12]},
+                {"x": 15.75, "y": 1, "matrix": [1, 13]},
+                {"x": 16.75, "y": 1, "w": 1.5, "matrix": [1, 14]},
+                {"x": 18.5, "y": 1, "matrix": [2, 14]},
 
-                {"x":0, "y":2, "matrix":[3, 0] },
-                {"x":1.25, "y":2, "w":1.75, "matrix":[2, 1] },
-                {"x":3, "y":2, "matrix":[2, 2] },
-                {"x":4, "y":2, "matrix":[2, 3] },
-                {"x":5, "y":2, "matrix":[2, 4] },
-                {"x":6, "y":2, "matrix":[2, 5] },
-                {"x":7, "y":2, "matrix":[2, 6] },
-                {"x":10, "y":2, "matrix":[2, 7] },
-                {"x":11, "y":2, "matrix":[2, 8] },
-                {"x":12, "y":2, "matrix":[2, 9] },
-                {"x":13, "y":2, "matrix":[2, 10] },
-                {"x":14, "y":2, "matrix":[2, 11] },
-                {"x":15, "y":2, "matrix":[2, 12] },
-                {"x":16, "y":2, "w":2.25, "matrix":[2, 13] },
+                {"x": 0, "y": 2, "matrix": [3, 0]},
+                {"x": 1.25, "y": 2, "w": 1.75, "matrix": [2, 1]},
+                {"x": 3, "y": 2, "matrix": [2, 2]},
+                {"x": 4, "y": 2, "matrix": [2, 3]},
+                {"x": 5, "y": 2, "matrix": [2, 4]},
+                {"x": 6, "y": 2, "matrix": [2, 5]},
+                {"x": 7, "y": 2, "matrix": [2, 6]},
+                {"x": 10, "y": 2, "matrix": [2, 7]},
+                {"x": 11, "y": 2, "matrix": [2, 8]},
+                {"x": 12, "y": 2, "matrix": [2, 9]},
+                {"x": 13, "y": 2, "matrix": [2, 10]},
+                {"x": 14, "y": 2, "matrix": [2, 11]},
+                {"x": 15, "y": 2, "matrix": [2, 12]},
+                {"x": 16, "y": 2, "w": 2.25, "matrix": [2, 13]},
 
-                {"x":1.25, "y":3, "w":2.25, "matrix":[3, 1] },
-                {"x":3.5, "y":3, "matrix":[3, 2] },
-                {"x":4.5, "y":3, "matrix":[3, 3] },
-                {"x":5.5, "y":3, "matrix":[3, 4] },
-                {"x":6.5, "y":3, "matrix":[3, 5] },
-                {"x":7.5, "y":3, "matrix":[3, 6] },
-                {"x":9.5, "y":3, "matrix":[3, 7] },
-                {"x":10.5, "y":3, "matrix":[3, 8] },
-                {"x":11.5, "y":3, "matrix":[3, 9] },
-                {"x":12.5, "y":3, "matrix":[3, 10] },
-                {"x":13.5, "y":3, "matrix":[3, 11] },
-                {"x":14.5, "y":3, "matrix":[3, 12] },
-                {"x":15.5, "y":3, "w":1.75, "matrix":[3, 13] },
-                {"x":17.5, "y":3.25, "matrix":[3, 14] },
+                {"x": 1.25, "y": 3, "w": 2.25, "matrix": [3, 1]},
+                {"x": 3.5, "y": 3, "matrix": [3, 2]},
+                {"x": 4.5, "y": 3, "matrix": [3, 3]},
+                {"x": 5.5, "y": 3, "matrix": [3, 4]},
+                {"x": 6.5, "y": 3, "matrix": [3, 5]},
+                {"x": 7.5, "y": 3, "matrix": [3, 6]},
+                {"x": 9.5, "y": 3, "matrix": [3, 7]},
+                {"x": 10.5, "y": 3, "matrix": [3, 8]},
+                {"x": 11.5, "y": 3, "matrix": [3, 9]},
+                {"x": 12.5, "y": 3, "matrix": [3, 10]},
+                {"x": 13.5, "y": 3, "matrix": [3, 11]},
+                {"x": 14.5, "y": 3, "matrix": [3, 12]},
+                {"x": 15.5, "y": 3, "w": 1.75, "matrix": [3, 13]},
+                {"x": 17.5, "y": 3.25, "matrix": [3, 14]},
 
-                {"x":1.25, "y":4, "w":1.5, "matrix":[4, 1] },
-                {"x":4.25, "y":4, "w":1.5, "matrix":[4, 3] },
-                {"x":5.75, "y":4, "w":2.25, "matrix":[4, 5] },
-                {"x":8, "y":4, "matrix":[4, 6] },
-                {"x":9.5, "y":4, "w":2.75, "matrix":[4, 8] },
-                {"x":12.25, "y":4, "w":1.5, "matrix":[4, 10] },
-                {"x":16.5, "y":4.25, "matrix":[4, 12] },
-                {"x":17.5, "y":4.25, "matrix":[4, 13] },
-                {"x":18.5, "y":4.25, "matrix":[4, 14] }
+                {"x": 1.25, "y": 4, "w": 1.5, "matrix": [4, 1]},
+                {"x": 4.25, "y": 4, "w": 1.5, "matrix": [4, 3]},
+                {"x": 5.75, "y": 4, "w": 2.25, "matrix": [4, 5]},
+                {"x": 8, "y": 4, "matrix": [4, 6]},
+                {"x": 9.5, "y": 4, "w": 2.75, "matrix": [4, 8]},
+                {"x": 12.25, "y": 4, "w": 1.5, "matrix": [4, 10]},
+                {"x": 16.5, "y": 4.25, "matrix": [4, 12]},
+                {"x": 17.5, "y": 4.25, "matrix": [4, 13]},
+                {"x": 18.5, "y": 4.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
index 7d19a24cb1..96e432e5ee 100644
--- a/keyboards/linworks/fave84h/info.json
+++ b/keyboards/linworks/fave84h/info.json
@@ -25,132 +25,132 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            { "flags": 1, "matrix": [3, 13], "x": 190, "y": 40 },
-            { "flags": 4, "matrix": [3, 11], "x": 167, "y": 40 },
-            { "flags": 4, "matrix": [3, 10], "x": 153, "y": 40 },
-            { "flags": 4, "matrix": [3, 9], "x": 139, "y": 40 },
-            { "flags": 4, "matrix": [3, 8], "x": 125, "y": 40 },
-            { "flags": 4, "matrix": [3, 7], "x": 111, "y": 40 },
-            { "flags": 4, "matrix": [3, 6], "x": 97, "y": 40 },
-            { "flags": 4, "matrix": [3, 5], "x": 83, "y": 40 },
-            { "flags": 4, "matrix": [3, 4], "x": 69, "y": 40 },
-            { "flags": 4, "matrix": [3, 3], "x": 55, "y": 40 },
-            { "flags": 4, "matrix": [3, 2], "x": 41, "y": 40 },
-            { "flags": 4, "matrix": [3, 1], "x": 27, "y": 40 },
-            { "flags": 1, "matrix": [3, 0], "x": 0, "y": 41 },
-            { "flags": 1, "matrix": [2, 0], "x": 6, "y": 27 },
-            { "flags": 4, "matrix": [2, 1], "x": 23, "y": 27 },
-            { "flags": 4, "matrix": [2, 2], "x": 37, "y": 27 },
-            { "flags": 4, "matrix": [2, 3], "x": 51, "y": 27 },
-            { "flags": 4, "matrix": [2, 4], "x": 65, "y": 27 },
-            { "flags": 4, "matrix": [2, 5], "x": 79, "y": 27 },
-            { "flags": 4, "matrix": [2, 6], "x": 93, "y": 27 },
-            { "flags": 4, "matrix": [2, 7], "x": 107, "y": 27 },
-            { "flags": 4, "matrix": [2, 8], "x": 121, "y": 27 },
-            { "flags": 4, "matrix": [2, 9], "x": 135, "y": 27 },
-            { "flags": 4, "matrix": [2, 10], "x": 149, "y": 27 },
-            { "flags": 4, "matrix": [2, 11], "x": 163, "y": 27 },
-            { "flags": 4, "matrix": [2, 12], "x": 177, "y": 27 },
-            { "flags": 1, "matrix": [2, 13], "x": 195, "y": 27 },
-            { "flags": 1, "matrix": [2, 14], "x": 216, "y": 27 },
-            { "flags": 1, "matrix": [2, 15], "x": 230, "y": 27 },
-            { "flags": 1, "matrix": [2, 16], "x": 244, "y": 27 },
-            { "flags": 1, "matrix": [1, 16], "x": 244, "y": 15 },
-            { "flags": 1, "matrix": [1, 15], "x": 230, "y": 15 },
-            { "flags": 1, "matrix": [1, 14], "x": 216, "y": 15 },
-            { "flags": 1, "matrix": [1, 13], "x": 191, "y": 17 },
-            { "flags": 4, "matrix": [1, 12], "x": 170, "y": 15 },
-            { "flags": 4, "matrix": [1, 11], "x": 156, "y": 15 },
-            { "flags": 4, "matrix": [1, 10], "x": 142, "y": 15 },
-            { "flags": 4, "matrix": [1, 9], "x": 128, "y": 15 },
-            { "flags": 4, "matrix": [1, 8], "x": 114, "y": 15 },
-            { "flags": 4, "matrix": [1, 7], "x": 100, "y": 15 },
-            { "flags": 4, "matrix": [1, 6], "x": 86, "y": 15 },
-            { "flags": 4, "matrix": [1, 5], "x": 72, "y": 15 },
-            { "flags": 4, "matrix": [1, 4], "x": 58, "y": 15 },
-            { "flags": 4, "matrix": [1, 3], "x": 44, "y": 15 },
-            { "flags": 4, "matrix": [1, 2], "x": 30, "y": 15 },
-            { "flags": 4, "matrix": [1, 1], "x": 16, "y": 15 },
-            { "flags": 1, "matrix": [1, 0], "x": 2, "y": 15 },
-            { "flags": 1, "matrix": [0, 0], "x": 2, "y": 0 },
-            { "flags": 1, "matrix": [0, 2], "x": 30, "y": 0 },
-            { "flags": 1, "matrix": [0, 3], "x": 44, "y": 0 },
-            { "flags": 1, "matrix": [0, 4], "x": 58, "y": 0 },
-            { "flags": 1, "matrix": [0, 5], "x": 72, "y": 0 },
-            { "flags": 1, "matrix": [0, 6], "x": 93, "y": 0 },
-            { "flags": 1, "matrix": [0, 7], "x": 107, "y": 0 },
-            { "flags": 1, "matrix": [0, 8], "x": 121, "y": 0 },
-            { "flags": 1, "matrix": [0, 9], "x": 135, "y": 0 },
-            { "flags": 1, "matrix": [0, 10], "x": 156, "y": 0 },
-            { "flags": 1, "matrix": [0, 11], "x": 170, "y": 0 },
-            { "flags": 1, "matrix": [0, 12], "x": 184, "y": 0 },
-            { "flags": 1, "matrix": [0, 13], "x": 198, "y": 0 },
-            { "flags": 1, "matrix": [0, 14], "x": 216, "y": 0 },
-            { "flags": 1, "matrix": [0, 15], "x": 230, "y": 0 },
-            { "flags": 1, "matrix": [0, 16], "x": 244, "y": 0 },
-            { "flags": 1, "matrix": [5, 16], "x": 244, "y": 64 },
-            { "flags": 1, "matrix": [5, 15], "x": 230, "y": 64 },
-            { "flags": 1, "matrix": [5, 14], "x": 216, "y": 64 },
-            { "flags": 1, "matrix": [5, 13], "x": 195, "y": 64 },
-            { "flags": 1, "matrix": [5, 12], "x": 177, "y": 64 },
-            { "flags": 1, "matrix": [5, 10], "x": 160, "y": 64 },
-            { "flags": 1, "matrix": [5, 5], "x": 100, "y": 64 },
-            { "flags": 1, "matrix": [5, 2], "x": 41, "y": 64 },
-            { "flags": 1, "matrix": [5, 1], "x": 23, "y": 64 },
-            { "flags": 1, "matrix": [5, 0], "x": 6, "y": 64 },
-            { "flags": 1, "matrix": [4, 0], "x": 11, "y": 52 },
-            { "flags": 4, "matrix": [4, 1], "x": 34, "y": 52 },
-            { "flags": 4, "matrix": [4, 2], "x": 48, "y": 52 },
-            { "flags": 4, "matrix": [4, 3], "x": 62, "y": 52 },
-            { "flags": 4, "matrix": [4, 4], "x": 76, "y": 52 },
-            { "flags": 4, "matrix": [4, 5], "x": 90, "y": 52 },
-            { "flags": 4, "matrix": [4, 6], "x": 104, "y": 52 },
-            { "flags": 4, "matrix": [4, 7], "x": 118, "y": 52 },
-            { "flags": 4, "matrix": [4, 8], "x": 132, "y": 52 },
-            { "flags": 4, "matrix": [4, 9], "x": 146, "y": 52 },
-            { "flags": 4, "matrix": [4, 10], "x": 160, "y": 52 },
-            { "flags": 1, "matrix": [4, 12], "x": 186, "y": 52 },
-            { "flags": 1, "matrix": [4, 15], "x": 230, "y": 52 },
-            { "flags": 2, "x": 242, "y": 55 },
-            { "flags": 2, "x": 227, "y": 55 },
-            { "flags": 2, "x": 212, "y": 55 },
-            { "flags": 2, "x": 198, "y": 55 },
-            { "flags": 2, "x": 183, "y": 55 },
-            { "flags": 2, "x": 168, "y": 55 },
-            { "flags": 2, "x": 153, "y": 55 },
-            { "flags": 2, "x": 138, "y": 55 },
-            { "flags": 2, "x": 123, "y": 55 },
-            { "flags": 2, "x": 108, "y": 55 },
-            { "flags": 2, "x": 93, "y": 55 },
-            { "flags": 2, "x": 78, "y": 55 },
-            { "flags": 2, "x": 67, "y": 55 },
-            { "flags": 2, "x": 49, "y": 55 },
-            { "flags": 2, "x": 34, "y": 55 },
-            { "flags": 2, "x": 17, "y": 55 },
-            { "flags": 2, "x": 6, "y": 55 },
-            { "flags": 2, "x": 6, "y": 43 },
-            { "flags": 2, "x": 6, "y": 30 },
-            { "flags": 2, "x": 6, "y": 18 },
-            { "flags": 2, "x": 6, "y": 3 },
-            { "flags": 2, "x": 20, "y": 3 },
-            { "flags": 2, "x": 35, "y": 3 },
-            { "flags": 2, "x": 50, "y": 3 },
-            { "flags": 2, "x": 65, "y": 3 },
-            { "flags": 2, "x": 80, "y": 3 },
-            { "flags": 2, "x": 94, "y": 3 },
-            { "flags": 2, "x": 109, "y": 3 },
-            { "flags": 2, "x": 124, "y": 3 },
-            { "flags": 2, "x": 139, "y": 3 },
-            { "flags": 2, "x": 153, "y": 3 },
-            { "flags": 2, "x": 168, "y": 3 },
-            { "flags": 2, "x": 183, "y": 3 },
-            { "flags": 2, "x": 198, "y": 3 },
-            { "flags": 2, "x": 212, "y": 3 },
-            { "flags": 2, "x": 227, "y": 3 },
-            { "flags": 2, "x": 242, "y": 3 },
-            { "flags": 2, "x": 242, "y": 18 },
-            { "flags": 2, "x": 242, "y": 31 },
-            { "flags": 2, "x": 242, "y": 43 }
+            {"flags": 1, "matrix": [3, 13], "x": 190, "y": 40},
+            {"flags": 4, "matrix": [3, 11], "x": 167, "y": 40},
+            {"flags": 4, "matrix": [3, 10], "x": 153, "y": 40},
+            {"flags": 4, "matrix": [3, 9], "x": 139, "y": 40},
+            {"flags": 4, "matrix": [3, 8], "x": 125, "y": 40},
+            {"flags": 4, "matrix": [3, 7], "x": 111, "y": 40},
+            {"flags": 4, "matrix": [3, 6], "x": 97, "y": 40},
+            {"flags": 4, "matrix": [3, 5], "x": 83, "y": 40},
+            {"flags": 4, "matrix": [3, 4], "x": 69, "y": 40},
+            {"flags": 4, "matrix": [3, 3], "x": 55, "y": 40},
+            {"flags": 4, "matrix": [3, 2], "x": 41, "y": 40},
+            {"flags": 4, "matrix": [3, 1], "x": 27, "y": 40},
+            {"flags": 1, "matrix": [3, 0], "x": 0, "y": 41},
+            {"flags": 1, "matrix": [2, 0], "x": 6, "y": 27},
+            {"flags": 4, "matrix": [2, 1], "x": 23, "y": 27},
+            {"flags": 4, "matrix": [2, 2], "x": 37, "y": 27},
+            {"flags": 4, "matrix": [2, 3], "x": 51, "y": 27},
+            {"flags": 4, "matrix": [2, 4], "x": 65, "y": 27},
+            {"flags": 4, "matrix": [2, 5], "x": 79, "y": 27},
+            {"flags": 4, "matrix": [2, 6], "x": 93, "y": 27},
+            {"flags": 4, "matrix": [2, 7], "x": 107, "y": 27},
+            {"flags": 4, "matrix": [2, 8], "x": 121, "y": 27},
+            {"flags": 4, "matrix": [2, 9], "x": 135, "y": 27},
+            {"flags": 4, "matrix": [2, 10], "x": 149, "y": 27},
+            {"flags": 4, "matrix": [2, 11], "x": 163, "y": 27},
+            {"flags": 4, "matrix": [2, 12], "x": 177, "y": 27},
+            {"flags": 1, "matrix": [2, 13], "x": 195, "y": 27},
+            {"flags": 1, "matrix": [2, 14], "x": 216, "y": 27},
+            {"flags": 1, "matrix": [2, 15], "x": 230, "y": 27},
+            {"flags": 1, "matrix": [2, 16], "x": 244, "y": 27},
+            {"flags": 1, "matrix": [1, 16], "x": 244, "y": 15},
+            {"flags": 1, "matrix": [1, 15], "x": 230, "y": 15},
+            {"flags": 1, "matrix": [1, 14], "x": 216, "y": 15},
+            {"flags": 1, "matrix": [1, 13], "x": 191, "y": 17},
+            {"flags": 4, "matrix": [1, 12], "x": 170, "y": 15},
+            {"flags": 4, "matrix": [1, 11], "x": 156, "y": 15},
+            {"flags": 4, "matrix": [1, 10], "x": 142, "y": 15},
+            {"flags": 4, "matrix": [1, 9], "x": 128, "y": 15},
+            {"flags": 4, "matrix": [1, 8], "x": 114, "y": 15},
+            {"flags": 4, "matrix": [1, 7], "x": 100, "y": 15},
+            {"flags": 4, "matrix": [1, 6], "x": 86, "y": 15},
+            {"flags": 4, "matrix": [1, 5], "x": 72, "y": 15},
+            {"flags": 4, "matrix": [1, 4], "x": 58, "y": 15},
+            {"flags": 4, "matrix": [1, 3], "x": 44, "y": 15},
+            {"flags": 4, "matrix": [1, 2], "x": 30, "y": 15},
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 15},
+            {"flags": 1, "matrix": [1, 0], "x": 2, "y": 15},
+            {"flags": 1, "matrix": [0, 0], "x": 2, "y": 0},
+            {"flags": 1, "matrix": [0, 2], "x": 30, "y": 0},
+            {"flags": 1, "matrix": [0, 3], "x": 44, "y": 0},
+            {"flags": 1, "matrix": [0, 4], "x": 58, "y": 0},
+            {"flags": 1, "matrix": [0, 5], "x": 72, "y": 0},
+            {"flags": 1, "matrix": [0, 6], "x": 93, "y": 0},
+            {"flags": 1, "matrix": [0, 7], "x": 107, "y": 0},
+            {"flags": 1, "matrix": [0, 8], "x": 121, "y": 0},
+            {"flags": 1, "matrix": [0, 9], "x": 135, "y": 0},
+            {"flags": 1, "matrix": [0, 10], "x": 156, "y": 0},
+            {"flags": 1, "matrix": [0, 11], "x": 170, "y": 0},
+            {"flags": 1, "matrix": [0, 12], "x": 184, "y": 0},
+            {"flags": 1, "matrix": [0, 13], "x": 198, "y": 0},
+            {"flags": 1, "matrix": [0, 14], "x": 216, "y": 0},
+            {"flags": 1, "matrix": [0, 15], "x": 230, "y": 0},
+            {"flags": 1, "matrix": [0, 16], "x": 244, "y": 0},
+            {"flags": 1, "matrix": [5, 16], "x": 244, "y": 64},
+            {"flags": 1, "matrix": [5, 15], "x": 230, "y": 64},
+            {"flags": 1, "matrix": [5, 14], "x": 216, "y": 64},
+            {"flags": 1, "matrix": [5, 13], "x": 195, "y": 64},
+            {"flags": 1, "matrix": [5, 12], "x": 177, "y": 64},
+            {"flags": 1, "matrix": [5, 10], "x": 160, "y": 64},
+            {"flags": 1, "matrix": [5, 5], "x": 100, "y": 64},
+            {"flags": 1, "matrix": [5, 2], "x": 41, "y": 64},
+            {"flags": 1, "matrix": [5, 1], "x": 23, "y": 64},
+            {"flags": 1, "matrix": [5, 0], "x": 6, "y": 64},
+            {"flags": 1, "matrix": [4, 0], "x": 11, "y": 52},
+            {"flags": 4, "matrix": [4, 1], "x": 34, "y": 52},
+            {"flags": 4, "matrix": [4, 2], "x": 48, "y": 52},
+            {"flags": 4, "matrix": [4, 3], "x": 62, "y": 52},
+            {"flags": 4, "matrix": [4, 4], "x": 76, "y": 52},
+            {"flags": 4, "matrix": [4, 5], "x": 90, "y": 52},
+            {"flags": 4, "matrix": [4, 6], "x": 104, "y": 52},
+            {"flags": 4, "matrix": [4, 7], "x": 118, "y": 52},
+            {"flags": 4, "matrix": [4, 8], "x": 132, "y": 52},
+            {"flags": 4, "matrix": [4, 9], "x": 146, "y": 52},
+            {"flags": 4, "matrix": [4, 10], "x": 160, "y": 52},
+            {"flags": 1, "matrix": [4, 12], "x": 186, "y": 52},
+            {"flags": 1, "matrix": [4, 15], "x": 230, "y": 52},
+            {"flags": 2, "x": 242, "y": 55},
+            {"flags": 2, "x": 227, "y": 55},
+            {"flags": 2, "x": 212, "y": 55},
+            {"flags": 2, "x": 198, "y": 55},
+            {"flags": 2, "x": 183, "y": 55},
+            {"flags": 2, "x": 168, "y": 55},
+            {"flags": 2, "x": 153, "y": 55},
+            {"flags": 2, "x": 138, "y": 55},
+            {"flags": 2, "x": 123, "y": 55},
+            {"flags": 2, "x": 108, "y": 55},
+            {"flags": 2, "x": 93, "y": 55},
+            {"flags": 2, "x": 78, "y": 55},
+            {"flags": 2, "x": 67, "y": 55},
+            {"flags": 2, "x": 49, "y": 55},
+            {"flags": 2, "x": 34, "y": 55},
+            {"flags": 2, "x": 17, "y": 55},
+            {"flags": 2, "x": 6, "y": 55},
+            {"flags": 2, "x": 6, "y": 43},
+            {"flags": 2, "x": 6, "y": 30},
+            {"flags": 2, "x": 6, "y": 18},
+            {"flags": 2, "x": 6, "y": 3},
+            {"flags": 2, "x": 20, "y": 3},
+            {"flags": 2, "x": 35, "y": 3},
+            {"flags": 2, "x": 50, "y": 3},
+            {"flags": 2, "x": 65, "y": 3},
+            {"flags": 2, "x": 80, "y": 3},
+            {"flags": 2, "x": 94, "y": 3},
+            {"flags": 2, "x": 109, "y": 3},
+            {"flags": 2, "x": 124, "y": 3},
+            {"flags": 2, "x": 139, "y": 3},
+            {"flags": 2, "x": 153, "y": 3},
+            {"flags": 2, "x": 168, "y": 3},
+            {"flags": 2, "x": 183, "y": 3},
+            {"flags": 2, "x": 198, "y": 3},
+            {"flags": 2, "x": 212, "y": 3},
+            {"flags": 2, "x": 227, "y": 3},
+            {"flags": 2, "x": 242, "y": 3},
+            {"flags": 2, "x": 242, "y": 18},
+            {"flags": 2, "x": 242, "y": 31},
+            {"flags": 2, "x": 242, "y": 43}
         ]
     },
     "url": "",
@@ -165,193 +165,193 @@
     "layouts": {
         "LAYOUT_tkl_ansi_tsangan_split_bs": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0 },
-                { "matrix": [0, 10], "x": 11, "y": 0 },
-                { "matrix": [0, 11], "x": 12, "y": 0 },
-                { "matrix": [0, 12], "x": 13, "y": 0 },
-                { "matrix": [0, 13], "x": 14, "y": 0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                {"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": [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, "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 },
-                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "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": [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},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"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, "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 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "matrix": [3, 13], "w": 2.25, "x": 12.75, "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},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
 
-                { "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
+                {"matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.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, 5], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 10], "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 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [5, 16], "x": 17.25, "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, 5], "w": 7, "x": 4, "y": 5.25},
+                {"matrix": [5, 10], "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},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi_tsangan": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0 },
-                { "matrix": [0, 9], "x": 9.5, "y": 0 },
-                { "matrix": [0, 10], "x": 11, "y": 0 },
-                { "matrix": [0, 11], "x": 12, "y": 0 },
-                { "matrix": [0, 12], "x": 13, "y": 0 },
-                { "matrix": [0, 13], "x": 14, "y": 0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                {"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], "w":2, "x": 13, "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": [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], "w": 2, "x": 13, "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, "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 },
-                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
-                { "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": [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},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25},
+                {"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, "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 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "matrix": [3, 13], "w": 2.25, "x": 12.75, "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},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25},
 
-                { "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
-                { "matrix": [4, 1], "x": 2.25, "y": 4.25 },
-                { "matrix": [4, 2], "x": 3.25, "y": 4.25 },
-                { "matrix": [4, 3], "x": 4.25, "y": 4.25 },
-                { "matrix": [4, 4], "x": 5.25, "y": 4.25 },
-                { "matrix": [4, 5], "x": 6.25, "y": 4.25 },
-                { "matrix": [4, 6], "x": 7.25, "y": 4.25 },
-                { "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "matrix": [4, 9], "x": 10.25, "y": 4.25 },
-                { "matrix": [4, 10], "x": 11.25, "y": 4.25 },
-                { "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
+                {"matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.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, 5], "w": 7, "x": 4, "y": 5.25 },
-                { "matrix": [5, 10], "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 },
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25 },
-                { "matrix": [5, 16], "x": 17.25, "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, 5], "w": 7, "x": 4, "y": 5.25},
+                {"matrix": [5, 10], "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},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/lpad/info.json b/keyboards/lpad/info.json
index 0278890610..57ab616eb3 100644
--- a/keyboards/lpad/info.json
+++ b/keyboards/lpad/info.json
@@ -20,14 +20,14 @@
             {"pin_a": "F0", "pin_b": "F1"}
         ]
     },
-    "layouts":{
+    "layouts": {
       "LAYOUT": {
-      "layout": [{ "label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
-                { "label": "Mute", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.5 },
-                { "label": "Next", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
-                { "label": "Prev", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
-                { "label": "Left", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
-                { "label": "Rght", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }]
+      "layout": [{"label": "Play", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
+                {"label": "Mute", "matrix": [0, 1], "w": 1, "x": 1.5, "y": 0.5},
+                {"label": "Next", "matrix": [1, 0], "w": 1, "x": 0, "y": 1},
+                {"label": "Prev", "matrix": [2, 0], "w": 1, "x": 0, "y": 2},
+                {"label": "Left", "matrix": [2, 1], "w": 1, "x": 1, "y": 2},
+                {"label": "Rght", "matrix": [2, 2], "w": 1, "x": 2, "y": 2}]
         },
      }
 }
diff --git a/keyboards/lucid/velvet_hotswap/info.json b/keyboards/lucid/velvet_hotswap/info.json
index 909b454f70..e3302cef1c 100644
--- a/keyboards/lucid/velvet_hotswap/info.json
+++ b/keyboards/lucid/velvet_hotswap/info.json
@@ -26,101 +26,101 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix": [0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix": [0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix": [0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix": [0, 5], "label":"F5", "x":5.5, "y":0},
-                {"matrix": [0, 6], "label":"F6", "x":6.5, "y":0},
-                {"matrix": [0, 7], "label":"F7", "x":7.5, "y":0},
-                {"matrix": [0, 8], "label":"F8", "x":8.5, "y":0},
-                {"matrix": [0, 9], "label":"F9", "x":9.75, "y":0},
-                {"matrix": [0, 10], "label":"F10", "x":10.75, "y":0},
-                {"matrix": [0, 11], "label":"F11", "x":11.75, "y":0},
-                {"matrix": [0, 12], "label":"F12", "x":12.75, "y":0},
-                {"matrix": [0, 13], "label":"F13", "x":14, "y":0},
-                {"matrix": [0, 14], "label":"PrtSc", "x":15.25, "y":0},
-                {"matrix": [0, 15], "label":"Scroll Lock", "x":16.25, "y":0},
-                {"matrix": [0, 16], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
 
-                {"matrix": [1, 0], "label":"~", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"!", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"@", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"#", "x":3, "y":1.25},
-                {"matrix": [1, 4], "label":"$", "x":4, "y":1.25},
-                {"matrix": [1, 5], "label":"%", "x":5, "y":1.25},
-                {"matrix": [1, 6], "label":"^", "x":6, "y":1.25},
-                {"matrix": [1, 7], "label":"&", "x":7, "y":1.25},
-                {"matrix": [1, 8], "label":"*", "x":8, "y":1.25},
-                {"matrix": [1, 9], "label":"(", "x":9, "y":1.25},
-                {"matrix": [1, 10], "label":")", "x":10, "y":1.25},
-                {"matrix": [1, 11], "label":"_", "x":11, "y":1.25},
-                {"matrix": [1, 12], "label":"+", "x":12, "y":1.25},
-                {"matrix": [3, 12], "label":"Back Space", "x":13, "y":1.25},
-                {"matrix": [1, 13], "label":"Back Space", "x":14, "y":1.25},
-                {"matrix": [1, 14], "label":"Insert", "x":15.25, "y":1.25},
-                {"matrix": [1, 15], "label":"Home", "x":16.25, "y":1.25},
-                {"matrix": [1, 16], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [3, 12], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
 
-                {"matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25},
-                {"matrix": [2, 2], "label":"W", "x":2.5, "y":2.25},
-                {"matrix": [2, 3], "label":"E", "x":3.5, "y":2.25},
-                {"matrix": [2, 4], "label":"R", "x":4.5, "y":2.25},
-                {"matrix": [2, 5], "label":"T", "x":5.5, "y":2.25},
-                {"matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25},
-                {"matrix": [2, 7], "label":"U", "x":7.5, "y":2.25},
-                {"matrix": [2, 8], "label":"I", "x":8.5, "y":2.25},
-                {"matrix": [2, 9], "label":"O", "x":9.5, "y":2.25},
-                {"matrix": [2, 10], "label":"P", "x":10.5, "y":2.25},
-                {"matrix": [2, 11], "label":"{", "x":11.5, "y":2.25},
-                {"matrix": [2, 12], "label":"}", "x":12.5, "y":2.25},
-                {"matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"matrix": [2, 14], "label":"Delete", "x":15.25, "y":2.25},
-                {"matrix": [2, 15], "label":"End", "x":16.25, "y":2.25},
-                {"matrix": [2, 16], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
 
-                {"matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"matrix": [3, 1], "label":"A", "x":1.75, "y":3.25},
-                {"matrix": [3, 2], "label":"S", "x":2.75, "y":3.25},
-                {"matrix": [3, 3], "label":"D", "x":3.75, "y":3.25},
-                {"matrix": [3, 4], "label":"F", "x":4.75, "y":3.25},
-                {"matrix": [3, 5], "label":"G", "x":5.75, "y":3.25},
-                {"matrix": [3, 6], "label":"H", "x":6.75, "y":3.25},
-                {"matrix": [3, 7], "label":"J", "x":7.75, "y":3.25},
-                {"matrix": [3, 8], "label":"K", "x":8.75, "y":3.25},
-                {"matrix": [3, 9], "label":"L", "x":9.75, "y":3.25},
-                {"matrix": [3, 10], "label":":", "x":10.75, "y":3.25},
-                {"matrix": [3, 11], "label":"SQ", "x":11.75, "y":3.25},
-                {"matrix": [3, 13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix": [4, 0], "label":"Left Shift", "x":0, "y":4.25, "w":2.25},
-                {"matrix": [4, 1], "label":"Z", "x":2.25, "y":4.25},
-                {"matrix": [4, 2], "label":"X", "x":3.25, "y":4.25},
-                {"matrix": [4, 3], "label":"C", "x":4.25, "y":4.25},
-                {"matrix": [4, 4], "label":"V", "x":5.25, "y":4.25},
-                {"matrix": [4, 5], "label":"B", "x":6.25, "y":4.25},
-                {"matrix": [4, 6], "label":"N", "x":7.25, "y":4.25},
-                {"matrix": [4, 7], "label":"M", "x":8.25, "y":4.25},
-                {"matrix": [4, 8], "label":"<", "x":9.25, "y":4.25},
-                {"matrix": [4, 9], "label":">", "x":10.25, "y":4.25},
-                {"matrix": [4, 10], "label":"?", "x":11.25, "y":4.25},
-                {"matrix": [4, 12], "label":"Right Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"matrix": [4, 13], "label":"Right Shift", "x":12.25, "y":4.25},
-                {"matrix": [4, 15], "label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 12.25, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
 
-                {"matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 5], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix": [5, 9], "label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"matrix": [5, 10], "label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 11], "label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"matrix": [5, 14], "label":"\u2190", "x":15.25, "y":5.25},
-                {"matrix": [5, 15], "label":"\u2193", "x":16.25, "y":5.25},
-                {"matrix": [5, 16], "label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/lucid/velvet_solder/info.json b/keyboards/lucid/velvet_solder/info.json
index 7f2bd1f7f5..e1469cb813 100644
--- a/keyboards/lucid/velvet_solder/info.json
+++ b/keyboards/lucid/velvet_solder/info.json
@@ -26,104 +26,104 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "label":"Esc", "x":0, "y":0},
-                {"matrix": [0, 1], "label":"F1", "x":1.25, "y":0},
-                {"matrix": [0, 2], "label":"F2", "x":2.25, "y":0},
-                {"matrix": [0, 3], "label":"F3", "x":3.25, "y":0},
-                {"matrix": [0, 4], "label":"F4", "x":4.25, "y":0},
-                {"matrix": [0, 5], "label":"F5", "x":5.5, "y":0},
-                {"matrix": [0, 6], "label":"F6", "x":6.5, "y":0},
-                {"matrix": [0, 7], "label":"F7", "x":7.5, "y":0},
-                {"matrix": [0, 8], "label":"F8", "x":8.5, "y":0},
-                {"matrix": [0, 9], "label":"F9", "x":9.75, "y":0},
-                {"matrix": [0, 10], "label":"F10", "x":10.75, "y":0},
-                {"matrix": [0, 11], "label":"F11", "x":11.75, "y":0},
-                {"matrix": [0, 12], "label":"F12", "x":12.75, "y":0},
-                {"matrix": [0, 13], "label":"F13", "x":14, "y":0},
-                {"matrix": [0, 14], "label":"PrtSc", "x":15.25, "y":0},
-                {"matrix": [0, 15], "label":"Scroll Lock", "x":16.25, "y":0},
-                {"matrix": [0, 16], "label":"Pause", "x":17.25, "y":0},
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+                {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+                {"matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0},
+                {"matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0},
 
-                {"matrix": [1, 0], "label":"~", "x":0, "y":1.25},
-                {"matrix": [1, 1], "label":"!", "x":1, "y":1.25},
-                {"matrix": [1, 2], "label":"@", "x":2, "y":1.25},
-                {"matrix": [1, 3], "label":"#", "x":3, "y":1.25},
-                {"matrix": [1, 4], "label":"$", "x":4, "y":1.25},
-                {"matrix": [1, 5], "label":"%", "x":5, "y":1.25},
-                {"matrix": [1, 6], "label":"^", "x":6, "y":1.25},
-                {"matrix": [1, 7], "label":"&", "x":7, "y":1.25},
-                {"matrix": [1, 8], "label":"*", "x":8, "y":1.25},
-                {"matrix": [1, 9], "label":"(", "x":9, "y":1.25},
-                {"matrix": [1, 10], "label":")", "x":10, "y":1.25},
-                {"matrix": [1, 11], "label":"_", "x":11, "y":1.25},
-                {"matrix": [1, 12], "label":"+", "x":12, "y":1.25},
-                {"matrix": [1, 13], "label":"Back Space", "x":13, "y":1.25},
-                {"matrix": [3, 14], "label":"Back Space", "x":14, "y":1.25},
-                {"matrix": [1, 14], "label":"Insert", "x":15.25, "y":1.25},
-                {"matrix": [1, 15], "label":"Home", "x":16.25, "y":1.25},
-                {"matrix": [1, 16], "label":"PgUp", "x":17.25, "y":1.25},
+                {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "label": "!", "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "label": "@", "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "label": "#", "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "label": "$", "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "label": "%", "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "label": "^", "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "label": "&", "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "label": "*", "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "label": "(", "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "label": ")", "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "label": "_", "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "label": "+", "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "label": "Back Space", "x": 13, "y": 1.25},
+                {"matrix": [3, 14], "label": "Back Space", "x": 14, "y": 1.25},
+                {"matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25},
+                {"matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25},
+                {"matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25},
 
-                {"matrix": [2, 0], "label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"matrix": [2, 1], "label":"Q", "x":1.5, "y":2.25},
-                {"matrix": [2, 2], "label":"W", "x":2.5, "y":2.25},
-                {"matrix": [2, 3], "label":"E", "x":3.5, "y":2.25},
-                {"matrix": [2, 4], "label":"R", "x":4.5, "y":2.25},
-                {"matrix": [2, 5], "label":"T", "x":5.5, "y":2.25},
-                {"matrix": [2, 6], "label":"Y", "x":6.5, "y":2.25},
-                {"matrix": [2, 7], "label":"U", "x":7.5, "y":2.25},
-                {"matrix": [2, 8], "label":"I", "x":8.5, "y":2.25},
-                {"matrix": [2, 9], "label":"O", "x":9.5, "y":2.25},
-                {"matrix": [2, 10], "label":"P", "x":10.5, "y":2.25},
-                {"matrix": [2, 11], "label":"{", "x":11.5, "y":2.25},
-                {"matrix": [2, 12], "label":"}", "x":12.5, "y":2.25},
-                {"matrix": [2, 13], "label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"matrix": [2, 14], "label":"Delete", "x":15.25, "y":2.25},
-                {"matrix": [2, 15], "label":"End", "x":16.25, "y":2.25},
-                {"matrix": [2, 16], "label":"PgDn", "x":17.25, "y":2.25},
+                {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "label": "|", "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25},
 
-                {"matrix": [3, 0], "label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"matrix": [3, 1], "label":"A", "x":1.75, "y":3.25},
-                {"matrix": [3, 2], "label":"S", "x":2.75, "y":3.25},
-                {"matrix": [3, 3], "label":"D", "x":3.75, "y":3.25},
-                {"matrix": [3, 4], "label":"F", "x":4.75, "y":3.25},
-                {"matrix": [3, 5], "label":"G", "x":5.75, "y":3.25},
-                {"matrix": [3, 6], "label":"H", "x":6.75, "y":3.25},
-                {"matrix": [3, 7], "label":"J", "x":7.75, "y":3.25},
-                {"matrix": [3, 8], "label":"K", "x":8.75, "y":3.25},
-                {"matrix": [3, 9], "label":"L", "x":9.75, "y":3.25},
-                {"matrix": [3, 10], "label":":", "x":10.75, "y":3.25},
-                {"matrix": [3, 11], "label":"SQ", "x":11.75, "y":3.25},
-                {"matrix": [3, 13], "label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "label": "SQ", "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
 
-                {"matrix": [4, 0], "label":"Left Shift", "x":0, "y":4.25, "w":1.25},
-                {"matrix": [4, 1], "label":"Left Shift", "x":1.25, "y":4.25, "w":1},
-                {"matrix": [4, 2], "label":"Z", "x":2.25, "y":4.25},
-                {"matrix": [4, 3], "label":"X", "x":3.25, "y":4.25},
-                {"matrix": [4, 4], "label":"C", "x":4.25, "y":4.25},
-                {"matrix": [4, 5], "label":"V", "x":5.25, "y":4.25},
-                {"matrix": [4, 6], "label":"B", "x":6.25, "y":4.25},
-                {"matrix": [4, 7], "label":"N", "x":7.25, "y":4.25},
-                {"matrix": [4, 8], "label":"M", "x":8.25, "y":4.25},
-                {"matrix": [4, 9], "label":"<", "x":9.25, "y":4.25},
-                {"matrix": [4, 10], "label":">", "x":10.25, "y":4.25},
-                {"matrix": [4, 11], "label":"?", "x":11.25, "y":4.25},
-                {"matrix": [4, 12], "label":"Right Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"matrix": [4, 13], "label":"Right Shift", "x":12.25, "y":4.25},
-                {"matrix": [4, 15], "label":"\u2191", "x":16.25, "y":4.25},
+                {"matrix": [4, 0], "label": "Left Shift", "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "label": "Left Shift", "x": 1.25, "y": 4.25, "w": 1},
+                {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25},
+                {"matrix": [4, 12], "label": "Right Shift", "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 13], "label": "Right Shift", "x": 12.25, "y": 4.25},
+                {"matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25},
 
-                {"matrix": [5, 0], "label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"matrix": [5, 1], "label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 2], "label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 4], "x":3.75, "y":5.25, "w":2.75},
-                {"matrix": [5, 5], "x":6.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 8], "x":6.75, "y":5.25, "w":2.25},
-                {"matrix": [5, 9], "label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"matrix": [5, 10], "label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"matrix": [5, 11], "label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"matrix": [5, 13], "label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"matrix": [5, 14], "label":"\u2190", "x":15.25, "y":5.25},
-                {"matrix": [5, 15], "label":"\u2193", "x":16.25, "y":5.25},
-                {"matrix": [5, 16], "label":"\u2192", "x":17.25, "y":5.25}
+                {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 5], "x": 6.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 6.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/makeymakey/info.json b/keyboards/makeymakey/info.json
index 19e3f7e858..1fc7bf9415 100644
--- a/keyboards/makeymakey/info.json
+++ b/keyboards/makeymakey/info.json
@@ -21,24 +21,24 @@
     "layouts": {
       "LAYOUT": {
         "layout": [
-          {"x":0, "y":0, "matrix": [0, 0]},
-          {"x":1, "y":0, "matrix": [0, 1]},
-          {"x":2, "y":0, "matrix": [0, 2]},
-          {"x":3, "y":0, "matrix": [0, 3]},
-          {"x":4, "y":0, "matrix": [0, 4]},
-          {"x":5, "y":0, "matrix": [0, 5]},
-          {"x":0, "y":1, "matrix": [1, 0]},
-          {"x":1, "y":1, "matrix": [1, 1]},
-          {"x":2, "y":1, "matrix": [1, 2]},
-          {"x":3, "y":1, "matrix": [1, 3]},
-          {"x":4, "y":1, "matrix": [1, 4]},
-          {"x":5, "y":1, "matrix": [1, 5]},
-          {"x":0, "y":2, "matrix": [2, 0]},
-          {"x":1, "y":2, "matrix": [2, 1]},
-          {"x":2, "y":2, "matrix": [2, 2]},
-          {"x":3, "y":2, "matrix": [2, 3]},
-          {"x":4, "y":2, "matrix": [2, 4]},
-          {"x":5, "y":2, "matrix": [2, 5]}
+          {"x": 0, "y": 0, "matrix": [0, 0]},
+          {"x": 1, "y": 0, "matrix": [0, 1]},
+          {"x": 2, "y": 0, "matrix": [0, 2]},
+          {"x": 3, "y": 0, "matrix": [0, 3]},
+          {"x": 4, "y": 0, "matrix": [0, 4]},
+          {"x": 5, "y": 0, "matrix": [0, 5]},
+          {"x": 0, "y": 1, "matrix": [1, 0]},
+          {"x": 1, "y": 1, "matrix": [1, 1]},
+          {"x": 2, "y": 1, "matrix": [1, 2]},
+          {"x": 3, "y": 1, "matrix": [1, 3]},
+          {"x": 4, "y": 1, "matrix": [1, 4]},
+          {"x": 5, "y": 1, "matrix": [1, 5]},
+          {"x": 0, "y": 2, "matrix": [2, 0]},
+          {"x": 1, "y": 2, "matrix": [2, 1]},
+          {"x": 2, "y": 2, "matrix": [2, 2]},
+          {"x": 3, "y": 2, "matrix": [2, 3]},
+          {"x": 4, "y": 2, "matrix": [2, 4]},
+          {"x": 5, "y": 2, "matrix": [2, 5]}
         ]
       }
     }
diff --git a/keyboards/marksard/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json
index 81728e0957..098427b0a3 100644
--- a/keyboards/marksard/treadstone32/info.json
+++ b/keyboards/marksard/treadstone32/info.json
@@ -5,173 +5,5 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0xDFA5"
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {
-                    "label": "Q",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "label": "A",
-                    "x": 0.25,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 1.25,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 2.25,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 3.25,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 4.25,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 5.25,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 6.25,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 7.25,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "label": "enter",
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "label": "Z",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 5.5,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 6.5,
-                    "y": 2
-                },
-                {
-                    "label": ",",
-                    "x": 7.5,
-                    "y": 2
-                },
-                {
-                    "label": ".",
-                    "x": 8.5,
-                    "y": 2
-                },
-                {
-                    "label": "/",
-                    "x": 9.5,
-                    "y": 2
-                },
-                {
-                    "label": "backspace",
-                    "x": 3.25,
-                    "y": 3,
-                    "w": 2
-                },
-                {
-                    "label": "space",
-                    "x": 5.25,
-                    "y": 3,
-                    "w": 2
-                }
-            ]
-        }
     }
 }
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index e277b1c266..f05898aed9 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -94,27 +94,8 @@
         "timeout": 250
     },
     "matrix_pins": {
-        "cols": [
-            "D7",
-            "B4",
-            "B5",
-            "B6",
-            "C6",
-            "C7",
-            "B0",
-            "F1",
-            "F4",
-            "F5",
-            "F6",
-            "F7"
-        ],
-        "rows": [
-            "B7",
-            "B3",
-            "B2",
-            "B1",
-            "D6"
-        ]
+        "cols": ["D7", "B4", "B5", "B6", "C6", "C7", "B0", "F1", "F4", "F5", "F6", "F7"],
+        "rows": ["B7", "B3", "B2", "B1", "D6"]
     },
     "rgblight": {
         "led_count": 8
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
index 25fa20a9c7..bd155a539e 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
@@ -11,105 +11,105 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+                {"label": "K00", "x": 0, "y": 0, "matrix": [0, 0]},
 
-                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+                {"label": "K01", "x": 2, "y": 0, "matrix": [0, 1]},
+                {"label": "K02", "x": 3, "y": 0, "matrix": [0, 2]},
+                {"label": "K03", "x": 4, "y": 0, "matrix": [0, 3]},
+                {"label": "K04", "x": 5, "y": 0, "matrix": [0, 4]},
 
-                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+                {"label": "K05", "x": 6.5, "y": 0, "matrix": [0, 5]},
+                {"label": "K06", "x": 7.5, "y": 0, "matrix": [0, 6]},
+                {"label": "K07", "x": 8.5, "y": 0, "matrix": [0, 7]},
+                {"label": "K08", "x": 9.5, "y": 0, "matrix": [0, 8]},
 
-                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+                {"label": "K09", "x": 11, "y": 0, "matrix": [0, 9]},
+                {"label": "K0A", "x": 12, "y": 0, "matrix": [0, 10]},
+                {"label": "K0B", "x": 13, "y": 0, "matrix": [0, 11]},
+                {"label": "K0C", "x": 14, "y": 0, "matrix": [0, 12]},
 
-                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "K0E", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "K0F", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "K0G", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+                {"label": "K10", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "K11", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "K12", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "K13", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "K14", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "K15", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "K16", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "K17", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "K18", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "K19", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": "K1A", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "K1B", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "K1C", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "K1D", "x": 13, "y": 1.25, "w": 2, "matrix": [1, 13]},
 
-                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "K1E", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "K1F", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "K1G", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label": "K20", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "K21", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "K22", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "K23", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "K24", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "K25", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "K26", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "K27", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "K28", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "K29", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "K2A", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "K2B", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "K2C", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "K2D", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
 
-                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "K2E", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "K2F", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "K2G", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+                {"label": "K30", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "K31", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "K32", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "K33", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "K34", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "K35", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "K36", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "K37", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K38", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "K39", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": "K3A", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "K3B", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "K3C", "x": 12.75, "y": 3.25, "matrix": [3, 12]},
+                {"label": "K3D", "x": 13.75, "y": 3.25, "w": 1.25, "matrix": [3, 13]},
 
-                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+                {"label": "K40", "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"label": "K41", "x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"label": "K42", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "K43", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "K44", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "K45", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "K46", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "K47", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "K48", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "K49", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": "K4A", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "K4B", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "K4D", "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [4, 13]},
 
-                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+                {"label": "K4F", "x": 16.25, "y": 4.25, "matrix": [4, 15]},
 
-                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
-                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+                {"label": "K50", "x": 0, "y": 5.25, "w": 1.5, "matrix": [5, 0]},
+                {"label": "K52", "x": 2.5, "y": 5.25, "w": 1.5, "matrix": [5, 2]},
+                {"label": "K56", "x": 4, "y": 5.25, "w": 7, "matrix": [5, 6]},
+                {"label": "K5B", "x": 11, "y": 5.25, "w": 1.5, "matrix": [5, 11]},
+                {"label": "K5D", "x": 13.5, "y": 5.25, "w": 1.5, "matrix": [5, 13]},
 
-                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
+                {"label": "K5E", "x": 15.25, "y": 5.25, "matrix": [5, 14]},
+                {"label": "K5F", "x": 16.25, "y": 5.25, "matrix": [5, 15]},
+                {"label": "K5G", "x": 17.25, "y": 5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
index 983d20fdbf..5fd5189c71 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
@@ -11,107 +11,107 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
+                {"label": "K00", "x": 0, "y": 0, "matrix": [0, 0]},
 
-                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
+                {"label": "K01", "x": 2, "y": 0, "matrix": [0, 1]},
+                {"label": "K02", "x": 3, "y": 0, "matrix": [0, 2]},
+                {"label": "K03", "x": 4, "y": 0, "matrix": [0, 3]},
+                {"label": "K04", "x": 5, "y": 0, "matrix": [0, 4]},
 
-                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
+                {"label": "K05", "x": 6.5, "y": 0, "matrix": [0, 5]},
+                {"label": "K06", "x": 7.5, "y": 0, "matrix": [0, 6]},
+                {"label": "K07", "x": 8.5, "y": 0, "matrix": [0, 7]},
+                {"label": "K08", "x": 9.5, "y": 0, "matrix": [0, 8]},
 
-                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
+                {"label": "K09", "x": 11, "y": 0, "matrix": [0, 9]},
+                {"label": "K0A", "x": 12, "y": 0, "matrix": [0, 10]},
+                {"label": "K0B", "x": 13, "y": 0, "matrix": [0, 11]},
+                {"label": "K0C", "x": 14, "y": 0, "matrix": [0, 12]},
 
-                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "K0E", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "K0F", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "K0G", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
+                {"label": "K10", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "K11", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "K12", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "K13", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "K14", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "K15", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "K16", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "K17", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "K18", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "K19", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": "K1A", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "K1B", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "K1C", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "K1D", "x": 13, "y": 1.25, "w": 2, "matrix": [1, 13]},
 
-                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "K1E", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "K1F", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "K1G", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label": "K20", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "K21", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "K22", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "K23", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "K24", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "K25", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "K26", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "K27", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "K28", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "K29", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "K2A", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "K2B", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "K2C", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "K2D", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
 
-                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "K2E", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "K2F", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "K2G", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+                {"label": "K30", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "K31", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "K32", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "K33", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "K34", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "K35", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "K36", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "K37", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K38", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "K39", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": "K3A", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "K3B", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "K3C", "x": 12.75, "y": 3.25, "matrix": [3, 12]},
+                {"label": "K3D", "x": 13.75, "y": 3.25, "w": 1.25, "matrix": [3, 13]},
 
-                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
+                {"label": "K40", "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"label": "K41", "x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"label": "K42", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "K43", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "K44", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "K45", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "K46", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "K47", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "K48", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "K49", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": "K4A", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "K4B", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "K4D", "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [4, 13]},
 
-                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
+                {"label": "K4F", "x": 16.25, "y": 4.25, "matrix": [4, 15]},
 
-                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
-                {"label":"K51", "x":1.5, "y":5.25, "matrix": [5, 1]},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
-                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
-                {"label":"K5C", "x":12.5, "y":5.25, "matrix": [5, 12]},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
+                {"label": "K50", "x": 0, "y": 5.25, "w": 1.5, "matrix": [5, 0]},
+                {"label": "K51", "x": 1.5, "y": 5.25, "matrix": [5, 1]},
+                {"label": "K52", "x": 2.5, "y": 5.25, "w": 1.5, "matrix": [5, 2]},
+                {"label": "K56", "x": 4, "y": 5.25, "w": 7, "matrix": [5, 6]},
+                {"label": "K5B", "x": 11, "y": 5.25, "w": 1.5, "matrix": [5, 11]},
+                {"label": "K5C", "x": 12.5, "y": 5.25, "matrix": [5, 12]},
+                {"label": "K5D", "x": 13.5, "y": 5.25, "w": 1.5, "matrix": [5, 13]},
 
-                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
+                {"label": "K5E", "x": 15.25, "y": 5.25, "matrix": [5, 14]},
+                {"label": "K5F", "x": 16.25, "y": 5.25, "matrix": [5, 15]},
+                {"label": "K5G", "x": 17.25, "y": 5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
index cd4cf76b35..c9f9562e5e 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json
@@ -14,110 +14,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+                {"label": "K00 (B0,B6)", "x": 0, "y": 0, "matrix": [0, 0]},
 
-                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+                {"label": "K01 (B0,F4)", "x": 2, "y": 0, "matrix": [0, 1]},
+                {"label": "K02 (B0,C0)", "x": 3, "y": 0, "matrix": [0, 2]},
+                {"label": "K03 (B0,C1)", "x": 4, "y": 0, "matrix": [0, 3]},
+                {"label": "K04 (B0,C2)", "x": 5, "y": 0, "matrix": [0, 4]},
 
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+                {"label": "K05 (B0,C3)", "x": 6.5, "y": 0, "matrix": [0, 5]},
+                {"label": "K06 (B0,C4)", "x": 7.5, "y": 0, "matrix": [0, 6]},
+                {"label": "K07 (B0,C5)", "x": 8.5, "y": 0, "matrix": [0, 7]},
+                {"label": "K08 (B0,C6)", "x": 9.5, "y": 0, "matrix": [0, 8]},
 
-                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+                {"label": "K09 (B0,C7)", "x": 11, "y": 0, "matrix": [0, 9]},
+                {"label": "K0A (B0,D0)", "x": 12, "y": 0, "matrix": [0, 10]},
+                {"label": "K0B (B0,D1)", "x": 13, "y": 0, "matrix": [0, 11]},
+                {"label": "K0C (B0,D2)", "x": 14, "y": 0, "matrix": [0, 12]},
 
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "K0E (B0,D4)", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "K0F (B0,D5)", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "K0G (B0,D6)", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+                {"label": "K10 (B1,B6)", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "K11 (B1,F4)", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "K12 (B1,C0)", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "K13 (B1,C1)", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "K14 (B1,C2)", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "K15 (B1,C3)", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "K16 (B1,C4)", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "K17 (B1,C5)", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "K18 (B1,C6)", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "K19 (B1,C7)", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": "K1A (B1,D0)", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "K1B (B1,D1)", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "K1C (B1,D2)", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "K1D (B1,D3)", "x": 13, "y": 1.25, "matrix": [1, 13]},
+                {"label": "K0D (B0,D3)", "x": 14, "y": 1.25, "matrix": [0, 13]},
 
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "K1E (B1,D4)", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "K1F (B1,D5)", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "K1G (B1,D6)", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label": "K20 (B2,B6)", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "K21 (B2,F4)", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "K22 (B2,C0)", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "K23 (B2,C1)", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "K24 (B2,C2)", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "K25 (B2,C3)", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "K26 (B2,C4)", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "K27 (B2,C5)", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "K28 (B2,C6)", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "K29 (B2,C7)", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "K2A (B2,D0)", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "K2B (B2,D1)", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "K2C (B2,D2)", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "K2D (B2,D3)", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
 
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "K2E (B2,D4)", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "K2F (B2,D5)", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "K2G (B2,D6)", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+                {"label": "K30 (B3,B6)", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "K31 (B3,F4)", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "K32 (B3,C0)", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "K33 (B3,C1)", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "K34 (B3,C2)", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "K35 (B3,C3)", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "K36 (B3,C4)", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "K37 (B3,C5)", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K38 (B3,C6)", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "K39 (B3,C7)", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": "K3A (B3,D0)", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "K3B (B3,D1)", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "K3C (B3,D2)", "x": 12.75, "y": 3.25, "matrix": [3, 12]},
+                {"label": "K3D (B3,D3)", "x": 13.75, "y": 3.25, "w": 1.25, "matrix": [3, 13]},
 
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+                {"label": "K40 (B4,B6)", "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"label": "K41 (B4,F4)", "x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"label": "K42 (B4,C0)", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "K43 (B4,C1)", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "K44 (B4,C2)", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "K45 (B4,C3)", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "K46 (B4,C4)", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "K47 (B4,C5)", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "K48 (B4,C6)", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "K49 (B4,C7)", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": "K4A (B4,D0)", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "K4B (B4,D1)", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "K4C (B4,D2)", "x": 12.25, "y": 4.25, "w": 1.75, "matrix": [4, 12]},
+                {"label": "K4D (B4,D3)", "x": 14, "y": 4.25, "matrix": [4, 13]},
 
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+                {"label": "K4F (B4,D5)", "x": 16.25, "y": 4.25, "matrix": [4, 15]},
 
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+                {"label": "K50 (B5,B6)", "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"label": "K51 (B5,F4)", "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"label": "K52 (B5,C0)", "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
+                {"label": "K56 (B5,C4)", "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"label": "K5A (B5,D0)", "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 10]},
+                {"label": "K5B (B5,D1)", "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 11]},
+                {"label": "K5C (B5,D2)", "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 12]},
+                {"label": "K5D (B5,D3)", "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 13]},
 
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
+                {"label": "K5E (B5,D4)", "x": 15.25, "y": 5.25, "matrix": [5, 14]},
+                {"label": "K5F (B5,D5)", "x": 16.25, "y": 5.25, "matrix": [5, 15]},
+                {"label": "K5G (B5,D6)", "x": 17.25, "y": 5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json
index b85416b9b2..c419d54d44 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/info.json
@@ -25,110 +25,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+                {"label": "K00 (B0,B6)", "x": 0, "y": 0, "matrix": [0, 0]},
 
-                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+                {"label": "K01 (B0,F4)", "x": 2, "y": 0, "matrix": [0, 1]},
+                {"label": "K02 (B0,C0)", "x": 3, "y": 0, "matrix": [0, 2]},
+                {"label": "K03 (B0,C1)", "x": 4, "y": 0, "matrix": [0, 3]},
+                {"label": "K04 (B0,C2)", "x": 5, "y": 0, "matrix": [0, 4]},
 
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+                {"label": "K05 (B0,C3)", "x": 6.5, "y": 0, "matrix": [0, 5]},
+                {"label": "K06 (B0,C4)", "x": 7.5, "y": 0, "matrix": [0, 6]},
+                {"label": "K07 (B0,C5)", "x": 8.5, "y": 0, "matrix": [0, 7]},
+                {"label": "K08 (B0,C6)", "x": 9.5, "y": 0, "matrix": [0, 8]},
 
-                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+                {"label": "K09 (B0,C7)", "x": 11, "y": 0, "matrix": [0, 9]},
+                {"label": "K0A (B0,D0)", "x": 12, "y": 0, "matrix": [0, 10]},
+                {"label": "K0B (B0,D1)", "x": 13, "y": 0, "matrix": [0, 11]},
+                {"label": "K0C (B0,D2)", "x": 14, "y": 0, "matrix": [0, 12]},
 
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "K0E (B0,D4)", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "K0F (B0,D5)", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "K0G (B0,D6)", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+                {"label": "K10 (B1,B6)", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "K11 (B1,F4)", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "K12 (B1,C0)", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "K13 (B1,C1)", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "K14 (B1,C2)", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "K15 (B1,C3)", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "K16 (B1,C4)", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "K17 (B1,C5)", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "K18 (B1,C6)", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "K19 (B1,C7)", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": "K1A (B1,D0)", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "K1B (B1,D1)", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "K1C (B1,D2)", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "K1D (B1,D3)", "x": 13, "y": 1.25, "matrix": [1, 13]},
+                {"label": "K0D (B0,D3)", "x": 14, "y": 1.25, "matrix": [0, 13]},
 
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "K1E (B1,D4)", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "K1F (B1,D5)", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "K1G (B1,D6)", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label": "K20 (B2,B6)", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "K21 (B2,F4)", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "K22 (B2,C0)", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "K23 (B2,C1)", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "K24 (B2,C2)", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "K25 (B2,C3)", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "K26 (B2,C4)", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "K27 (B2,C5)", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "K28 (B2,C6)", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "K29 (B2,C7)", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "K2A (B2,D0)", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "K2B (B2,D1)", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "K2C (B2,D2)", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "K2D (B2,D3)", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
 
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "K2E (B2,D4)", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "K2F (B2,D5)", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "K2G (B2,D6)", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+                {"label": "K30 (B3,B6)", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "K31 (B3,F4)", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "K32 (B3,C0)", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "K33 (B3,C1)", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "K34 (B3,C2)", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "K35 (B3,C3)", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "K36 (B3,C4)", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "K37 (B3,C5)", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K38 (B3,C6)", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "K39 (B3,C7)", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": "K3A (B3,D0)", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "K3B (B3,D1)", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "K3C (B3,D2)", "x": 12.75, "y": 3.25, "matrix": [3, 12]},
+                {"label": "K3D (B3,D3)", "x": 13.75, "y": 3.25, "w": 1.25, "matrix": [3, 13]},
 
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+                {"label": "K40 (B4,B6)", "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"label": "K41 (B4,F4)", "x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"label": "K42 (B4,C0)", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "K43 (B4,C1)", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "K44 (B4,C2)", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "K45 (B4,C3)", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "K46 (B4,C4)", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "K47 (B4,C5)", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "K48 (B4,C6)", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "K49 (B4,C7)", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": "K4A (B4,D0)", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "K4B (B4,D1)", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "K4C (B4,D2)", "x": 12.25, "y": 4.25, "w": 1.75, "matrix": [4, 12]},
+                {"label": "K4D (B4,D3)", "x": 14, "y": 4.25, "matrix": [4, 13]},
 
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+                {"label": "K4F (B4,D5)", "x": 16.25, "y": 4.25, "matrix": [4, 15]},
 
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+                {"label": "K50 (B5,B6)", "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"label": "K51 (B5,F4)", "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"label": "K52 (B5,C0)", "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
+                {"label": "K56 (B5,C4)", "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"label": "K5A (B5,D0)", "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 10]},
+                {"label": "K5B (B5,D1)", "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 11]},
+                {"label": "K5C (B5,D2)", "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 12]},
+                {"label": "K5D (B5,D3)", "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 13]},
 
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
+                {"label": "K5E (B5,D4)", "x": 15.25, "y": 5.25, "matrix": [5, 14]},
+                {"label": "K5F (B5,D5)", "x": 16.25, "y": 5.25, "matrix": [5, 15]},
+                {"label": "K5G (B5,D6)", "x": 17.25, "y": 5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
index 097fc6a820..6348dd907a 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json
@@ -22,110 +22,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
+                {"label": "K00 (B0,B6)", "x": 0, "y": 0, "matrix": [0, 0]},
 
-                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
+                {"label": "K01 (B0,F4)", "x": 2, "y": 0, "matrix": [0, 1]},
+                {"label": "K02 (B0,C0)", "x": 3, "y": 0, "matrix": [0, 2]},
+                {"label": "K03 (B0,C1)", "x": 4, "y": 0, "matrix": [0, 3]},
+                {"label": "K04 (B0,C2)", "x": 5, "y": 0, "matrix": [0, 4]},
 
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
+                {"label": "K05 (B0,C3)", "x": 6.5, "y": 0, "matrix": [0, 5]},
+                {"label": "K06 (B0,C4)", "x": 7.5, "y": 0, "matrix": [0, 6]},
+                {"label": "K07 (B0,C5)", "x": 8.5, "y": 0, "matrix": [0, 7]},
+                {"label": "K08 (B0,C6)", "x": 9.5, "y": 0, "matrix": [0, 8]},
 
-                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
+                {"label": "K09 (B0,C7)", "x": 11, "y": 0, "matrix": [0, 9]},
+                {"label": "K0A (B0,D0)", "x": 12, "y": 0, "matrix": [0, 10]},
+                {"label": "K0B (B0,D1)", "x": 13, "y": 0, "matrix": [0, 11]},
+                {"label": "K0C (B0,D2)", "x": 14, "y": 0, "matrix": [0, 12]},
 
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "K0E (B0,D4)", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "K0F (B0,D5)", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "K0G (B0,D6)", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13 (B1,C1)", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14 (B1,C2)", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15 (B1,C3)", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16 (B1,C4)", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17 (B1,C5)", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18 (B1,C6)", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19 (B1,C7)", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A (B1,D0)", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B (B1,D1)", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C (B1,D2)", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D (B1,D3)", "x":13, "y":1.25, "matrix": [1, 13]},
-                {"label":"K0D (B0,D3)", "x":14, "y":1.25, "matrix": [0, 13]},
+                {"label": "K10 (B1,B6)", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "K11 (B1,F4)", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "K12 (B1,C0)", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "K13 (B1,C1)", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "K14 (B1,C2)", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "K15 (B1,C3)", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "K16 (B1,C4)", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "K17 (B1,C5)", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "K18 (B1,C6)", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "K19 (B1,C7)", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": "K1A (B1,D0)", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "K1B (B1,D1)", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "K1C (B1,D2)", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "K1D (B1,D3)", "x": 13, "y": 1.25, "matrix": [1, 13]},
+                {"label": "K0D (B0,D3)", "x": 14, "y": 1.25, "matrix": [0, 13]},
 
-                {"label":"K1E (B1,D4)", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F (B1,D5)", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G (B1,D6)", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "K1E (B1,D4)", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "K1F (B1,D5)", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "K1G (B1,D6)", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"K20 (B2,B6)", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21 (B2,F4)", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22 (B2,C0)", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23 (B2,C1)", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24 (B2,C2)", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25 (B2,C3)", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26 (B2,C4)", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27 (B2,C5)", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28 (B2,C6)", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29 (B2,C7)", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A (B2,D0)", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B (B2,D1)", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C (B2,D2)", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D (B2,D3)", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
+                {"label": "K20 (B2,B6)", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "K21 (B2,F4)", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "K22 (B2,C0)", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "K23 (B2,C1)", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "K24 (B2,C2)", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "K25 (B2,C3)", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "K26 (B2,C4)", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "K27 (B2,C5)", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "K28 (B2,C6)", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "K29 (B2,C7)", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "K2A (B2,D0)", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "K2B (B2,D1)", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "K2C (B2,D2)", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "K2D (B2,D3)", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
 
-                {"label":"K2E (B2,D4)", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F (B2,D5)", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G (B2,D6)", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "K2E (B2,D4)", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "K2F (B2,D5)", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "K2G (B2,D6)", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"K30 (B3,B6)", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31 (B3,F4)", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32 (B3,C0)", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33 (B3,C1)", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34 (B3,C2)", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35 (B3,C3)", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36 (B3,C4)", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37 (B3,C5)", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38 (B3,C6)", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39 (B3,C7)", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A (B3,D0)", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B (B3,D1)", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C (B3,D2)", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D (B3,D3)", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
+                {"label": "K30 (B3,B6)", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "K31 (B3,F4)", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "K32 (B3,C0)", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "K33 (B3,C1)", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "K34 (B3,C2)", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "K35 (B3,C3)", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "K36 (B3,C4)", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "K37 (B3,C5)", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K38 (B3,C6)", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "K39 (B3,C7)", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": "K3A (B3,D0)", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "K3B (B3,D1)", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "K3C (B3,D2)", "x": 12.75, "y": 3.25, "matrix": [3, 12]},
+                {"label": "K3D (B3,D3)", "x": 13.75, "y": 3.25, "w": 1.25, "matrix": [3, 13]},
 
-                {"label":"K40 (B4,B6)", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41 (B4,F4)", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42 (B4,C0)", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43 (B4,C1)", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44 (B4,C2)", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45 (B4,C3)", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46 (B4,C4)", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47 (B4,C5)", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48 (B4,C6)", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49 (B4,C7)", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A (B4,D0)", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B (B4,D1)", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4C (B4,D2)", "x":12.25, "y":4.25, "w":1.75, "matrix": [4, 12]},
-                {"label":"K4D (B4,D3)", "x":14, "y":4.25, "matrix": [4, 13]},
+                {"label": "K40 (B4,B6)", "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]},
+                {"label": "K41 (B4,F4)", "x": 1.25, "y": 4.25, "matrix": [4, 1]},
+                {"label": "K42 (B4,C0)", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "K43 (B4,C1)", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "K44 (B4,C2)", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "K45 (B4,C3)", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "K46 (B4,C4)", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "K47 (B4,C5)", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "K48 (B4,C6)", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "K49 (B4,C7)", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": "K4A (B4,D0)", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "K4B (B4,D1)", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "K4C (B4,D2)", "x": 12.25, "y": 4.25, "w": 1.75, "matrix": [4, 12]},
+                {"label": "K4D (B4,D3)", "x": 14, "y": 4.25, "matrix": [4, 13]},
 
-                {"label":"K4F (B4,D5)", "x":16.25, "y":4.25, "matrix": [4, 15]},
+                {"label": "K4F (B4,D5)", "x": 16.25, "y": 4.25, "matrix": [4, 15]},
 
-                {"label":"K50 (B5,B6)", "x":0, "y":5.25, "w":1.25, "matrix": [5, 0]},
-                {"label":"K51 (B5,F4)", "x":1.25, "y":5.25, "w":1.25, "matrix": [5, 1]},
-                {"label":"K52 (B5,C0)", "x":2.5, "y":5.25, "w":1.25, "matrix": [5, 2]},
-                {"label":"K56 (B5,C4)", "x":3.75, "y":5.25, "w":6.25, "matrix": [5, 6]},
-                {"label":"K5A (B5,D0)", "x":10, "y":5.25, "w":1.25, "matrix": [5, 10]},
-                {"label":"K5B (B5,D1)", "x":11.25, "y":5.25, "w":1.25, "matrix": [5, 11]},
-                {"label":"K5C (B5,D2)", "x":12.5, "y":5.25, "w":1.25, "matrix": [5, 12]},
-                {"label":"K5D (B5,D3)", "x":13.75, "y":5.25, "w":1.25, "matrix": [5, 13]},
+                {"label": "K50 (B5,B6)", "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]},
+                {"label": "K51 (B5,F4)", "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]},
+                {"label": "K52 (B5,C0)", "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]},
+                {"label": "K56 (B5,C4)", "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]},
+                {"label": "K5A (B5,D0)", "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 10]},
+                {"label": "K5B (B5,D1)", "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 11]},
+                {"label": "K5C (B5,D2)", "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 12]},
+                {"label": "K5D (B5,D3)", "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 13]},
 
-                {"label":"K5E (B5,D4)", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F (B5,D5)", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G (B5,D6)", "x":17.25, "y":5.25, "matrix": [5, 16]}
+                {"label": "K5E (B5,D4)", "x": 15.25, "y": 5.25, "matrix": [5, 14]},
+                {"label": "K5F (B5,D5)", "x": 16.25, "y": 5.25, "matrix": [5, 15]},
+                {"label": "K5G (B5,D6)", "x": 17.25, "y": 5.25, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json
index 6def1c9fbe..c9bcd05195 100644
--- a/keyboards/mechwild/bde/lefty/info.json
+++ b/keyboards/mechwild/bde/lefty/info.json
@@ -30,49 +30,49 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"7", "x":0, "y":0 },
-                { "matrix": [0, 1], "label":"8", "x":1, "y":0 },
-                { "matrix": [0, 2], "label":"9", "x":2, "y":0 },
-                { "matrix": [0, 3], "label":"0", "x":3, "y":0 },
-                { "matrix": [0, 4], "label":"Q", "x":4, "y":0 },
-                { "matrix": [0, 5], "label":"W", "x":5, "y":0 },
-                { "matrix": [0, 6], "label":"E", "x":6, "y":0 },
-                { "matrix": [0, 7], "label":"R", "x":7, "y":0 },
-                { "matrix": [0, 8], "label":"T", "x":8, "y":0 },
-                { "matrix": [0, 9], "label":"Y", "x":9, "y":0 },
-                { "matrix": [0, 10], "label":"U", "x":10, "y":0 },
-                { "matrix": [0, 11], "label":"I", "x":11, "y":0 },
-                { "matrix": [0, 12], "label":"O", "x":12, "y":0 },
-                { "matrix": [0, 13], "label":"P", "x":13, "y":0 },
+                {"matrix": [0, 0], "label": "7", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "8", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "9", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "0", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "Q", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "W", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "E", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "R", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "T", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "Y", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "U", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "I", "x": 11, "y": 0},
+                {"matrix": [0, 12], "label": "O", "x": 12, "y": 0},
+                {"matrix": [0, 13], "label": "P", "x": 13, "y": 0},
 
-                { "matrix": [1, 0], "label":"4", "x":0, "y":1 },
-                { "matrix": [1, 1], "label":"5", "x":1, "y":1 },
-                { "matrix": [1, 2], "label":"6", "x":2, "y":1 },
-                { "matrix": [1, 3], "label":"Enter", "x":3, "y":1, "h":2 },
-                { "matrix": [1, 4], "label":"A", "x":4, "y":1 },
-                { "matrix": [1, 5], "label":"S", "x":5, "y":1 },
-                { "matrix": [1, 6], "label":"D", "x":6, "y":1 },
-                { "matrix": [1, 7], "label":"F", "x":7, "y":1 },
-                { "matrix": [1, 8], "label":"G", "x":8, "y":1 },
-                { "matrix": [1, 9], "label":"H", "x":9, "y":1 },
-                { "matrix": [1, 10], "label":"J", "x":10, "y":1 },
-                { "matrix": [1, 11], "label":"K", "x":11, "y":1 },
-                { "matrix": [1, 12], "label":"L", "x":12, "y":1 },
-                { "matrix": [1, 13], "label":"Esc", "x":13, "y":1 },
+                {"matrix": [1, 0], "label": "4", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "5", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "6", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "Enter", "x": 3, "y": 1, "h": 2},
+                {"matrix": [1, 4], "label": "A", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "S", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "D", "x": 6, "y": 1},
+                {"matrix": [1, 7], "label": "F", "x": 7, "y": 1},
+                {"matrix": [1, 8], "label": "G", "x": 8, "y": 1},
+                {"matrix": [1, 9], "label": "H", "x": 9, "y": 1},
+                {"matrix": [1, 10], "label": "J", "x": 10, "y": 1},
+                {"matrix": [1, 11], "label": "K", "x": 11, "y": 1},
+                {"matrix": [1, 12], "label": "L", "x": 12, "y": 1},
+                {"matrix": [1, 13], "label": "Esc", "x": 13, "y": 1},
 
-                { "matrix": [2, 0], "label":"1", "x":0, "y":2 },
-                { "matrix": [2, 1], "label":"2", "x":1, "y":2 },
-                { "matrix": [2, 2], "label":"3", "x":2, "y":2 },
-                { "matrix": [2, 4], "label":"Z", "x":4, "y":2 },
-                { "matrix": [2, 5], "label":"X", "x":5, "y":2 },
-                { "matrix": [2, 6], "label":"C", "x":6, "y":2 },
-                { "matrix": [2, 7], "label":"V", "x":7, "y":2 },
-                { "matrix": [2, 8], "label":"Back", "x":8, "y":2 },
-                { "matrix": [2, 9], "label":"Space", "x":9, "y":2 },
-                { "matrix": [2, 10], "label":"B", "x":10, "y":2 },
-                { "matrix": [2, 11], "label":"N", "x":11, "y":2 },
-                { "matrix": [2, 12], "label":"M", "x":12, "y":2 },
-                { "matrix": [2, 13], "label":"Shift", "x":13, "y":2 }
+                {"matrix": [2, 0], "label": "1", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "2", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "3", "x": 2, "y": 2},
+                {"matrix": [2, 4], "label": "Z", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "X", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "C", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "V", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "Back", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "Space", "x": 9, "y": 2},
+                {"matrix": [2, 10], "label": "B", "x": 10, "y": 2},
+                {"matrix": [2, 11], "label": "N", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "M", "x": 12, "y": 2},
+                {"matrix": [2, 13], "label": "Shift", "x": 13, "y": 2}
             ]
         }
     }
diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json
index 4b64ddeffd..b8b7fc39d0 100644
--- a/keyboards/mechwild/bde/rev2/info.json
+++ b/keyboards/mechwild/bde/rev2/info.json
@@ -29,50 +29,50 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"Q", "x":0, "y":0},
-                { "matrix": [0, 1], "label":"W", "x":1, "y":0},
-                { "matrix": [0, 2], "label":"E", "x":2, "y":0},
-                { "matrix": [0, 3], "label":"R", "x":3, "y":0},
-                { "matrix": [0, 4], "label":"T", "x":4, "y":0},
-                { "matrix": [0, 5], "label":"Y", "x":5, "y":0},
-                { "matrix": [0, 6], "label":"U", "x":6, "y":0},
-                { "matrix": [3, 6], "label":"I", "x":7, "y":0},
-                { "matrix": [3, 5], "label":"O", "x":8, "y":0},
-                { "matrix": [3, 4], "label":"P", "x":9, "y":0},
-                { "matrix": [3, 3], "label":"7", "x":10, "y":0},
-                { "matrix": [3, 2], "label":"8", "x":11, "y":0},
-                { "matrix": [3, 1], "label":"9", "x":12, "y":0},
-                { "matrix": [3, 0], "label":"Mute", "x":13, "y":0},
+                {"matrix": [0, 0], "label": "Q", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "W", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "E", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "R", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "T", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "Y", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "U", "x": 6, "y": 0},
+                {"matrix": [3, 6], "label": "I", "x": 7, "y": 0},
+                {"matrix": [3, 5], "label": "O", "x": 8, "y": 0},
+                {"matrix": [3, 4], "label": "P", "x": 9, "y": 0},
+                {"matrix": [3, 3], "label": "7", "x": 10, "y": 0},
+                {"matrix": [3, 2], "label": "8", "x": 11, "y": 0},
+                {"matrix": [3, 1], "label": "9", "x": 12, "y": 0},
+                {"matrix": [3, 0], "label": "Mute", "x": 13, "y": 0},
 
-                { "matrix": [1, 0], "label":"A", "x":0, "y":1},
-                { "matrix": [1, 1], "label":"S", "x":1, "y":1},
-                { "matrix": [1, 2], "label":"D", "x":2, "y":1},
-                { "matrix": [1, 3], "label":"F", "x":3, "y":1},
-                { "matrix": [1, 4], "label":"G", "x":4, "y":1},
-                { "matrix": [1, 5], "label":"H", "x":5, "y":1},
-                { "matrix": [1, 6], "label":"J", "x":6, "y":1},
-                { "matrix": [4, 6], "label":"K", "x":7, "y":1},
-                { "matrix": [4, 5], "label":"L", "x":8, "y":1},
-                { "matrix": [4, 4], "label":"Esc", "x":9, "y":1},
-                { "matrix": [4, 3], "label":"4", "x":10, "y":1},
-                { "matrix": [4, 2], "label":"5", "x":11, "y":1},
-                { "matrix": [4, 1], "label":"6", "x":12, "y":1},
-                { "matrix": [4, 0], "label":"0", "x":13, "y":1},
+                {"matrix": [1, 0], "label": "A", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "S", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "D", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "F", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "G", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "H", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "J", "x": 6, "y": 1},
+                {"matrix": [4, 6], "label": "K", "x": 7, "y": 1},
+                {"matrix": [4, 5], "label": "L", "x": 8, "y": 1},
+                {"matrix": [4, 4], "label": "Esc", "x": 9, "y": 1},
+                {"matrix": [4, 3], "label": "4", "x": 10, "y": 1},
+                {"matrix": [4, 2], "label": "5", "x": 11, "y": 1},
+                {"matrix": [4, 1], "label": "6", "x": 12, "y": 1},
+                {"matrix": [4, 0], "label": "0", "x": 13, "y": 1},
 
-                { "matrix": [2, 0], "label":"Z", "x":0, "y":2},
-                { "matrix": [2, 1], "label":"X", "x":1, "y":2},
-                { "matrix": [2, 2], "label":"C", "x":2, "y":2},
-                { "matrix": [2, 3], "label":"V", "x":3, "y":2},
-                { "matrix": [2, 4], "label":"Back", "x":4, "y":2},
-                { "matrix": [2, 5], "label":"Space", "x":5, "y":2},
-                { "matrix": [2, 6], "label":"B", "x":6, "y":2},
-                { "matrix": [5, 6], "label":"N", "x":7, "y":2},
-                { "matrix": [5, 5], "label":"M", "x":8, "y":2},
-                { "matrix": [5, 4], "label":"Enter", "x":9, "y":2},
-                { "matrix": [5, 3], "label":"1", "x":10, "y":2},
-                { "matrix": [5, 2], "label":"2", "x":11, "y":2},
-                { "matrix": [5, 1], "label":"3", "x":12, "y":2},
-                { "matrix": [5, 0], "label":"EQL", "x":13, "y":2}
+                {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "X", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "C", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "V", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "B", "x": 6, "y": 2},
+                {"matrix": [5, 6], "label": "N", "x": 7, "y": 2},
+                {"matrix": [5, 5], "label": "M", "x": 8, "y": 2},
+                {"matrix": [5, 4], "label": "Enter", "x": 9, "y": 2},
+                {"matrix": [5, 3], "label": "1", "x": 10, "y": 2},
+                {"matrix": [5, 2], "label": "2", "x": 11, "y": 2},
+                {"matrix": [5, 1], "label": "3", "x": 12, "y": 2},
+                {"matrix": [5, 0], "label": "EQL", "x": 13, "y": 2}
             ]
         }
     }
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json
index c51e60c260..3f254da286 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/righty/info.json
@@ -30,49 +30,49 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "label":"Q", "x":0, "y":0 },
-                { "matrix": [0, 1], "label":"W", "x":1, "y":0 },
-                { "matrix": [0, 2], "label":"E", "x":2, "y":0 },
-                { "matrix": [0, 3], "label":"R", "x":3, "y":0 },
-                { "matrix": [0, 4], "label":"T", "x":4, "y":0 },
-                { "matrix": [0, 5], "label":"Y", "x":5, "y":0 },
-                { "matrix": [0, 6], "label":"U", "x":6, "y":0 },
-                { "matrix": [0, 7], "label":"I", "x":7, "y":0 },
-                { "matrix": [0, 8], "label":"O", "x":8, "y":0 },
-                { "matrix": [0, 9], "label":"P", "x":9, "y":0 },
-                { "matrix": [0, 10], "label":"0", "x":10, "y":0 },
-                { "matrix": [0, 11], "label":"7", "x":11, "y":0 },
-                { "matrix": [0, 12], "label":"8", "x":12, "y":0 },
-                { "matrix": [0, 13], "label":"9", "x":13, "y":0 },
+                {"matrix": [0, 0], "label": "Q", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "W", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "E", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "R", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "T", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "Y", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "U", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "I", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "O", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "P", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "0", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "7", "x": 11, "y": 0},
+                {"matrix": [0, 12], "label": "8", "x": 12, "y": 0},
+                {"matrix": [0, 13], "label": "9", "x": 13, "y": 0},
 
-                { "matrix": [1, 0], "label":"A", "x":0, "y":1 },
-                { "matrix": [1, 1], "label":"S", "x":1, "y":1 },
-                { "matrix": [1, 2], "label":"D", "x":2, "y":1 },
-                { "matrix": [1, 3], "label":"F", "x":3, "y":1 },
-                { "matrix": [1, 4], "label":"G", "x":4, "y":1 },
-                { "matrix": [1, 5], "label":"H", "x":5, "y":1 },
-                { "matrix": [1, 6], "label":"J", "x":6, "y":1 },
-                { "matrix": [1, 7], "label":"K", "x":7, "y":1 },
-                { "matrix": [1, 8], "label":"L", "x":8, "y":1 },
-                { "matrix": [1, 9], "label":"Esc", "x":9, "y":1 },
-                { "matrix": [1, 10], "label":"Enter", "x":10, "y":1, "h":2 },
-                { "matrix": [1, 11], "label":"4", "x":11, "y":1 },
-                { "matrix": [1, 12], "label":"5", "x":12, "y":1 },
-                { "matrix": [1, 13], "label":"6", "x":13, "y":1 },
+                {"matrix": [1, 0], "label": "A", "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "S", "x": 1, "y": 1},
+                {"matrix": [1, 2], "label": "D", "x": 2, "y": 1},
+                {"matrix": [1, 3], "label": "F", "x": 3, "y": 1},
+                {"matrix": [1, 4], "label": "G", "x": 4, "y": 1},
+                {"matrix": [1, 5], "label": "H", "x": 5, "y": 1},
+                {"matrix": [1, 6], "label": "J", "x": 6, "y": 1},
+                {"matrix": [1, 7], "label": "K", "x": 7, "y": 1},
+                {"matrix": [1, 8], "label": "L", "x": 8, "y": 1},
+                {"matrix": [1, 9], "label": "Esc", "x": 9, "y": 1},
+                {"matrix": [1, 10], "label": "Enter", "x": 10, "y": 1, "h": 2},
+                {"matrix": [1, 11], "label": "4", "x": 11, "y": 1},
+                {"matrix": [1, 12], "label": "5", "x": 12, "y": 1},
+                {"matrix": [1, 13], "label": "6", "x": 13, "y": 1},
 
-                { "matrix": [2, 0], "label":"Z", "x":0, "y":2 },
-                { "matrix": [2, 1], "label":"X", "x":1, "y":2 },
-                { "matrix": [2, 2], "label":"C", "x":2, "y":2 },
-                { "matrix": [2, 3], "label":"V", "x":3, "y":2 },
-                { "matrix": [2, 4], "label":"Back", "x":4, "y":2 },
-                { "matrix": [2, 5], "label":"Space", "x":5, "y":2 },
-                { "matrix": [2, 6], "label":"B", "x":6, "y":2 },
-                { "matrix": [2, 7], "label":"N", "x":7, "y":2 },
-                { "matrix": [2, 8], "label":"M", "x":8, "y":2 },
-                { "matrix": [2, 9], "label":"Esc", "x":9, "y":2 },
-                { "matrix": [2, 11], "label":"1", "x":11, "y":2 },
-                { "matrix": [2, 12], "label":"2", "x":12, "y":2 },
-                { "matrix": [2, 13], "label":"3", "x":13, "y":2 }
+                {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "X", "x": 1, "y": 2},
+                {"matrix": [2, 2], "label": "C", "x": 2, "y": 2},
+                {"matrix": [2, 3], "label": "V", "x": 3, "y": 2},
+                {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2},
+                {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2},
+                {"matrix": [2, 6], "label": "B", "x": 6, "y": 2},
+                {"matrix": [2, 7], "label": "N", "x": 7, "y": 2},
+                {"matrix": [2, 8], "label": "M", "x": 8, "y": 2},
+                {"matrix": [2, 9], "label": "Esc", "x": 9, "y": 2},
+                {"matrix": [2, 11], "label": "1", "x": 11, "y": 2},
+                {"matrix": [2, 12], "label": "2", "x": 12, "y": 2},
+                {"matrix": [2, 13], "label": "3", "x": 13, "y": 2}
             ]
         }
     }
diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json
index 6f5cc66dea..530f0fe972 100644
--- a/keyboards/mechwild/clunker/info.json
+++ b/keyboards/mechwild/clunker/info.json
@@ -33,57 +33,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-            { "matrix": [0, 0], "x":0, "y":0},
-            { "matrix": [0, 1], "x":1, "y":0},
-            { "matrix": [0, 2], "x":2, "y":0},
-            { "matrix": [0, 3], "x":3, "y":0},
-            { "matrix": [0, 4], "x":4, "y":0},
-            { "matrix": [0, 5], "x":5, "y":0},
-            { "matrix": [0, 6], "x":6, "y":0},
-            { "matrix": [0, 7], "x":7, "y":0},
-            { "matrix": [1, 0], "x":0, "y":1, "w":1.5},
-            { "matrix": [1, 1], "x":1.5, "y":1},
-            { "matrix": [1, 2], "x":2.5, "y":1},
-            { "matrix": [1, 3], "x":3.5, "y":1},
-            { "matrix": [1, 4], "x":4.5, "y":1},
-            { "matrix": [1, 5], "x":5.5, "y":1},
-            { "matrix": [1, 6], "x":6.5, "y":1},
-            { "matrix": [1, 7], "x":7.5, "y":1},
-            { "matrix": [5, 7], "x":8.5, "y":1},
-            { "matrix": [5, 6], "x":9.5, "y":1},
-            { "matrix": [5, 5], "x":10.5, "y":1},
-            { "matrix": [5, 4], "x":11.5, "y":1},
-            { "matrix": [2, 0], "x":0, "y":2, "w":1.75},
-            { "matrix": [2, 1], "x":1.75, "y":2},
-            { "matrix": [2, 2], "x":2.75, "y":2},
-            { "matrix": [2, 3], "x":3.75, "y":2},
-            { "matrix": [2, 4], "x":4.75, "y":2},
-            { "matrix": [2, 5], "x":5.75, "y":2},
-            { "matrix": [2, 6], "x":6.75, "y":2},
-            { "matrix": [2, 7], "x":7.75, "y":2},
-            { "matrix": [5, 1], "x":8.75, "y":2},
-            { "matrix": [5, 2], "x":9.75, "y":2},
-            { "matrix": [5, 3], "x":10.75, "y":2, "w":1.75},
-            { "matrix": [3, 0], "x":0, "y":3, "w":1.25},
-            { "matrix": [3, 1], "x":1.25, "y":3},
-            { "matrix": [3, 2], "x":2.25, "y":3},
-            { "matrix": [3, 3], "x":3.25, "y":3},
-            { "matrix": [3, 4], "x":4.25, "y":3},
-            { "matrix": [3, 5], "x":5.25, "y":3},
-            { "matrix": [3, 6], "x":6.25, "y":3},
-            { "matrix": [3, 7], "x":7.25, "y":3},
-            { "matrix": [6, 7], "x":8.25, "y":3},
-            { "matrix": [6, 6], "x":9.25, "y":3},
-            { "matrix": [6, 5], "x":10.25, "y":3},
-            { "matrix": [6, 4], "x":11.25, "y":3, "w":1.25},
-            { "matrix": [4, 0], "x":0, "y":4, "w":1.25},
-            { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25},
-            { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25},
-            { "matrix": [4, 3], "x":3.75, "y":4, "w":2.75},
-            { "matrix": [4, 4], "x":6.5, "y":4, "w":2.25},
-            { "matrix": [4, 5], "x":8.75, "y":4, "w":1.25},
-            { "matrix": [4, 6], "x":10, "y":4, "w":1.25},
-            { "matrix": [4, 7], "x":11.25, "y":4, "w":1.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": [1, 0], "x": 0, "y": 1, "w": 1.5},
+            {"matrix": [1, 1], "x": 1.5, "y": 1},
+            {"matrix": [1, 2], "x": 2.5, "y": 1},
+            {"matrix": [1, 3], "x": 3.5, "y": 1},
+            {"matrix": [1, 4], "x": 4.5, "y": 1},
+            {"matrix": [1, 5], "x": 5.5, "y": 1},
+            {"matrix": [1, 6], "x": 6.5, "y": 1},
+            {"matrix": [1, 7], "x": 7.5, "y": 1},
+            {"matrix": [5, 7], "x": 8.5, "y": 1},
+            {"matrix": [5, 6], "x": 9.5, "y": 1},
+            {"matrix": [5, 5], "x": 10.5, "y": 1},
+            {"matrix": [5, 4], "x": 11.5, "y": 1},
+            {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+            {"matrix": [2, 1], "x": 1.75, "y": 2},
+            {"matrix": [2, 2], "x": 2.75, "y": 2},
+            {"matrix": [2, 3], "x": 3.75, "y": 2},
+            {"matrix": [2, 4], "x": 4.75, "y": 2},
+            {"matrix": [2, 5], "x": 5.75, "y": 2},
+            {"matrix": [2, 6], "x": 6.75, "y": 2},
+            {"matrix": [2, 7], "x": 7.75, "y": 2},
+            {"matrix": [5, 1], "x": 8.75, "y": 2},
+            {"matrix": [5, 2], "x": 9.75, "y": 2},
+            {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75},
+            {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+            {"matrix": [3, 1], "x": 1.25, "y": 3},
+            {"matrix": [3, 2], "x": 2.25, "y": 3},
+            {"matrix": [3, 3], "x": 3.25, "y": 3},
+            {"matrix": [3, 4], "x": 4.25, "y": 3},
+            {"matrix": [3, 5], "x": 5.25, "y": 3},
+            {"matrix": [3, 6], "x": 6.25, "y": 3},
+            {"matrix": [3, 7], "x": 7.25, "y": 3},
+            {"matrix": [6, 7], "x": 8.25, "y": 3},
+            {"matrix": [6, 6], "x": 9.25, "y": 3},
+            {"matrix": [6, 5], "x": 10.25, "y": 3},
+            {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25},
+            {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+            {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+            {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+            {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75},
+            {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25},
+            {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25},
+            {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+            {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 5f7916822c..046776be49 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -56,57 +56,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0},
-                { "matrix": [0, 1], "x":1, "y":0},
-                { "matrix": [0, 2], "x":2, "y":0},
-                { "matrix": [0, 3], "x":3, "y":0},
-                { "matrix": [0, 4], "x":4, "y":0},
-                { "matrix": [0, 5], "x":5, "y":0},
-                { "matrix": [8, 0], "x":9, "y":0},
-                { "matrix": [4, 0], "x":10.5, "y":0},
-                { "matrix": [4, 1], "x":11.5, "y":0},
-                { "matrix": [4, 2], "x":12.5, "y":0},
-                { "matrix": [4, 3], "x":13.5, "y":0},
-                { "matrix": [4, 4], "x":14.5, "y":0},
-                { "matrix": [4, 5], "x":15.5, "y":0},
-                { "matrix": [1, 0], "x":0, "y":1},
-                { "matrix": [1, 1], "x":1, "y":1},
-                { "matrix": [1, 2], "x":2, "y":1},
-                { "matrix": [1, 3], "x":3, "y":1},
-                { "matrix": [1, 4], "x":4, "y":1},
-                { "matrix": [1, 5], "x":5, "y":1},
-                { "matrix": [8, 5], "x":8, "y":1},
-                { "matrix": [8, 1], "x":9, "y":1},
-                { "matrix": [5, 0], "x":10.5, "y":1},
-                { "matrix": [5, 1], "x":11.5, "y":1},
-                { "matrix": [5, 2], "x":12.5, "y":1},
-                { "matrix": [5, 3], "x":13.5, "y":1},
-                { "matrix": [5, 4], "x":14.5, "y":1},
-                { "matrix": [5, 5], "x":15.5, "y":1},
-                { "matrix": [2, 0], "x":0, "y":2},
-                { "matrix": [2, 1], "x":1, "y":2},
-                { "matrix": [2, 2], "x":2, "y":2},
-                { "matrix": [2, 3], "x":3, "y":2},
-                { "matrix": [2, 4], "x":4, "y":2},
-                { "matrix": [2, 5], "x":5, "y":2},
-                { "matrix": [8, 2], "x":9, "y":2},
-                { "matrix": [6, 0], "x":10.5, "y":2},
-                { "matrix": [6, 1], "x":11.5, "y":2},
-                { "matrix": [6, 2], "x":12.5, "y":2},
-                { "matrix": [6, 3], "x":13.5, "y":2},
-                { "matrix": [6, 4], "x":14.5, "y":2},
-                { "matrix": [6, 5], "x":15.5, "y":2},
-                { "matrix": [3, 0], "x":2.25, "y":3.5},
-                { "matrix": [3, 1], "x":3.5, "y":3.5, "h":1.5},
-                { "matrix": [3, 2], "x":4.5, "y":3.5, "h":1.5},
-                { "matrix": [3, 3], "x":5.5, "y":3.5, "h":1.5},
-                { "matrix": [3, 4], "x":6.75, "y":3.5},
-                { "matrix": [7, 0], "x":7.75, "y":3.5},
-                { "matrix": [7, 1], "x":8.75, "y":3.5},
-                { "matrix": [7, 2], "x":10, "y":3.5, "h":1.5},
-                { "matrix": [7, 3], "x":11, "y":3.5, "h":1.5},
-                { "matrix": [7, 4], "x":12, "y":3.5, "h":1.5},
-                { "matrix": [7, 5], "x":13.25, "y":3.5}
+                {"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": [8, 0], "x": 9, "y": 0},
+                {"matrix": [4, 0], "x": 10.5, "y": 0},
+                {"matrix": [4, 1], "x": 11.5, "y": 0},
+                {"matrix": [4, 2], "x": 12.5, "y": 0},
+                {"matrix": [4, 3], "x": 13.5, "y": 0},
+                {"matrix": [4, 4], "x": 14.5, "y": 0},
+                {"matrix": [4, 5], "x": 15.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [8, 5], "x": 8, "y": 1},
+                {"matrix": [8, 1], "x": 9, "y": 1},
+                {"matrix": [5, 0], "x": 10.5, "y": 1},
+                {"matrix": [5, 1], "x": 11.5, "y": 1},
+                {"matrix": [5, 2], "x": 12.5, "y": 1},
+                {"matrix": [5, 3], "x": 13.5, "y": 1},
+                {"matrix": [5, 4], "x": 14.5, "y": 1},
+                {"matrix": [5, 5], "x": 15.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [8, 2], "x": 9, "y": 2},
+                {"matrix": [6, 0], "x": 10.5, "y": 2},
+                {"matrix": [6, 1], "x": 11.5, "y": 2},
+                {"matrix": [6, 2], "x": 12.5, "y": 2},
+                {"matrix": [6, 3], "x": 13.5, "y": 2},
+                {"matrix": [6, 4], "x": 14.5, "y": 2},
+                {"matrix": [6, 5], "x": 15.5, "y": 2},
+                {"matrix": [3, 0], "x": 2.25, "y": 3.5},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 4], "x": 6.75, "y": 3.5},
+                {"matrix": [7, 0], "x": 7.75, "y": 3.5},
+                {"matrix": [7, 1], "x": 8.75, "y": 3.5},
+                {"matrix": [7, 2], "x": 10, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 3], "x": 11, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 4], "x": 12, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 5], "x": 13.25, "y": 3.5}
             ]
         }
     }
diff --git a/keyboards/meletrix/zoom75/info.json b/keyboards/meletrix/zoom75/info.json
index 664105c89c..20d7dc064a 100644
--- a/keyboards/meletrix/zoom75/info.json
+++ b/keyboards/meletrix/zoom75/info.json
@@ -29,119 +29,103 @@
   },
   "matrix_pins": {
     "rows": ["F4", "F1", "F0", "C6", "B6", "F5"],
-    "cols": [
-      "C7",
-      "D5",
-      "B5",
-      "B4",
-      "D7",
-      "D6",
-      "D4",
-      "D3",
-      "D2",
-      "D1",
-      "D0",
-      "B7",
-      "B2",
-      "B3",
-      "F7"
-    ]
+    "cols": ["C7", "D5", "B5", "B4", "D7", "D6", "D4", "D3", "D2", "D1", "D0", "B7", "B2", "B3", "F7"]
   },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
-        { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 },
-        { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 },
-        { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 },
-        { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 },
-        { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 },
-        { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 },
-        { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 },
-        { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 },
-        { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 },
-        { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 },
-        { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 },
-        { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 },
-        { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 },
-        { "matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0 },
+        {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+        {"matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0},
+        {"matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0},
+        {"matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0},
+        {"matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0},
+        {"matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0},
+        {"matrix": [0, 13], "label": "F13", "x": 14, "y": 0},
+        {"matrix": [0, 14], "label": "Encoder", "x": 15, "y": 0},
 
-        { "matrix": [1, 0], "label": "~", "x": 0, "y": 1.25 },
-        { "matrix": [1, 1], "label": "1", "x": 1, "y": 1.25 },
-        { "matrix": [1, 2], "label": "2", "x": 2, "y": 1.25 },
-        { "matrix": [1, 3], "label": "3", "x": 3, "y": 1.25 },
-        { "matrix": [1, 4], "label": "4", "x": 4, "y": 1.25 },
-        { "matrix": [1, 5], "label": "5", "x": 5, "y": 1.25 },
-        { "matrix": [1, 6], "label": "6", "x": 6, "y": 1.25 },
-        { "matrix": [1, 7], "label": "7", "x": 7, "y": 1.25 },
-        { "matrix": [1, 8], "label": "8", "x": 8, "y": 1.25 },
-        { "matrix": [1, 9], "label": "9", "x": 9, "y": 1.25 },
-        { "matrix": [1, 10], "label": "0", "x": 10, "y": 1.25 },
-        { "matrix": [1, 11], "label": "-", "x": 11, "y": 1.25 },
-        { "matrix": [1, 12], "label": "=", "x": 12, "y": 1.25 },
-        { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 },
-        { "matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25 },
-        { "matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25 },
+        {"matrix": [1, 0], "label": "~", "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "label": "1", "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "label": "2", "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "label": "3", "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "label": "4", "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "label": "5", "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "label": "6", "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "label": "7", "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "label": "8", "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "label": "9", "x": 9, "y": 1.25},
+        {"matrix": [1, 10], "label": "0", "x": 10, "y": 1.25},
+        {"matrix": [1, 11], "label": "-", "x": 11, "y": 1.25},
+        {"matrix": [1, 12], "label": "=", "x": 12, "y": 1.25},
+        {"matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25},
+        {"matrix": [3, 13], "label": "Backspace1", "x": 14, "y": 1.25},
+        {"matrix": [1, 14], "label": "Delect", "x": 15, "y": 1.25},
 
-        { "matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-        { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 },
-        { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 },
-        { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 },
-        { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 },
-        { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 },
-        { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 },
-        { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 },
-        { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 },
-        { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 },
-        { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 },
-        { "matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25 },
-        { "matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25 },
-        { "matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
-        { "matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25 },
+        {"matrix": [2, 0], "label": "Tab", "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25},
+        {"matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25},
+        {"matrix": [2, 11], "label": "[", "x": 11.5, "y": 2.25},
+        {"matrix": [2, 12], "label": "]", "x": 12.5, "y": 2.25},
+        {"matrix": [2, 13], "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 14], "label": "PageUp", "x": 15, "y": 2.25},
 
-        { "matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-        { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 },
-        { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 },
-        { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 },
-        { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 },
-        { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 },
-        { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 },
-        { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 },
-        { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 },
-        { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 },
-        { "matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25 },
-        { "matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25 },
-        { "matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-        { "matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25 },
+        {"matrix": [3, 0], "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25},
+        {"matrix": [3, 10], "label": ";", "x": 10.75, "y": 3.25},
+        {"matrix": [3, 11], "label": "'", "x": 11.75, "y": 3.25},
+        {"matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25},
+        {"matrix": [3, 14], "label": "PageDown", "x": 15, "y": 3.25},
 
-        { "matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-        { "matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25 },
-        { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 },
-        { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 },
-        { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 },
-        { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 },
-        { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 },
-        { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 },
-        { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 },
-        { "matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25 },
-        { "matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25 },
-        { "matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25 },
-        { "matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-        { "matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25 },
+        {"matrix": [4, 0], "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "label": "Shift2", "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "label": ",", "x": 9.25, "y": 4.25},
+        {"matrix": [4, 10], "label": ".", "x": 10.25, "y": 4.25},
+        {"matrix": [4, 11], "label": "/", "x": 11.25, "y": 4.25},
+        {"matrix": [4, 12], "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75},
+        {"matrix": [4, 13], "label": "\u2191", "x": 14, "y": 4.25},
 
-        { "matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25 },
-        { "matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75 },
-        { "matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25 },
-        { "matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25 },
-        { "matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25 },
-        { "matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25 }
+        {"matrix": [5, 0], "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 5], "label": "Space", "x": 3.75, "y": 5.25, "w": 2.25},
+        {"matrix": [5, 6], "label": "Space", "x": 6, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 7], "label": "Space", "x": 7.25, "y": 5.25, "w": 2.75},
+        {"matrix": [5, 9], "label": "Alt", "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 10], "label": "Fn", "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 12], "label": "\u2190", "x": 13, "y": 5.25},
+        {"matrix": [5, 13], "label": "\u2193", "x": 14, "y": 5.25},
+        {"matrix": [5, 14], "label": "\u2192", "x": 15, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/meow48/info.json b/keyboards/meow48/info.json
index 311c10b635..a9bd82af30 100644
--- a/keyboards/meow48/info.json
+++ b/keyboards/meow48/info.json
@@ -21,57 +21,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label":"ESC", "matrix": [0, 0], "x": 0, "y": 0 },
-                { "label":"Q", "matrix": [1, 0], "x": 1, "y": 0 },
-                { "label":"W", "matrix": [0, 1], "x": 2, "y": 0 },
-                { "label":"E", "matrix": [1, 1], "x": 3, "y": 0 },
-                { "label":"R", "matrix": [0, 2], "x": 4, "y": 0 },
-                { "label":"T", "matrix": [1, 2], "x": 5, "y": 0 },
-                { "label":"Y", "matrix": [2, 2], "x": 6, "y": 0 },
-                { "label":"U", "matrix": [0, 3], "x": 7, "y": 0 },
-                { "label":"I", "matrix": [1, 3], "x": 8, "y": 0 },
-                { "label":"O", "matrix": [0, 4], "x": 9, "y": 0 },
-                { "label":"P", "matrix": [1, 4], "x": 10, "y": 0 },
-                { "label":"MINS", "matrix": [0, 5], "x": 11, "y": 0 },
-                { "label":"BSPC", "matrix": [1, 5], "w": 1.25, "x": 12, "y": 0 },
+                {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "E", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "T", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [2, 2], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 3], "x": 7, "y": 0},
+                {"label": "I", "matrix": [1, 3], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 4], "x": 9, "y": 0},
+                {"label": "P", "matrix": [1, 4], "x": 10, "y": 0},
+                {"label": "MINS", "matrix": [0, 5], "x": 11, "y": 0},
+                {"label": "BSPC", "matrix": [1, 5], "w": 1.25, "x": 12, "y": 0},
 
-                { "label":"TAB", "matrix": [2, 0], "w": 1.25, "x": 0, "y": 1 },
-                { "label":"A", "matrix": [3, 0], "x": 1.25, "y": 1 },
-                { "label":"S", "matrix": [2, 1], "x": 2.25, "y": 1 },
-                { "label":"D", "matrix": [3, 1], "x": 3.25, "y": 1 },
-                { "label":"F", "matrix": [3, 2], "x": 4.25, "y": 1 },
-                { "label":"G", "matrix": [4, 2], "x": 5.25, "y": 1 },
-                { "label":"H", "matrix": [2, 3], "x": 6.25, "y": 1 },
-                { "label":"J", "matrix": [3, 3], "x": 7.25, "y": 1 },
-                { "label":"K", "matrix": [2, 4], "x": 8.25, "y": 1 },
-                { "label":"L", "matrix": [3, 4], "x": 9.25, "y": 1 },
-                { "label":"SCLN", "matrix": [2, 5], "x": 10.25, "y": 1 },
-                { "label":"ENT", "matrix": [3, 5], "w": 2, "x": 11.25, "y": 1 },
+                {"label": "TAB", "matrix": [2, 0], "w": 1.25, "x": 0, "y": 1},
+                {"label": "A", "matrix": [3, 0], "x": 1.25, "y": 1},
+                {"label": "S", "matrix": [2, 1], "x": 2.25, "y": 1},
+                {"label": "D", "matrix": [3, 1], "x": 3.25, "y": 1},
+                {"label": "F", "matrix": [3, 2], "x": 4.25, "y": 1},
+                {"label": "G", "matrix": [4, 2], "x": 5.25, "y": 1},
+                {"label": "H", "matrix": [2, 3], "x": 6.25, "y": 1},
+                {"label": "J", "matrix": [3, 3], "x": 7.25, "y": 1},
+                {"label": "K", "matrix": [2, 4], "x": 8.25, "y": 1},
+                {"label": "L", "matrix": [3, 4], "x": 9.25, "y": 1},
+                {"label": "SCLN", "matrix": [2, 5], "x": 10.25, "y": 1},
+                {"label": "ENT", "matrix": [3, 5], "w": 2, "x": 11.25, "y": 1},
 
-                { "label":"LSFT", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 2 },
-                { "label":"Z", "matrix": [5, 0], "x": 1.5, "y": 2 },
-                { "label":"X", "matrix": [4, 1], "x": 2.5, "y": 2 },
-                { "label":"C", "matrix": [5, 1], "x": 3.5, "y": 2 },
-                { "label":"V", "matrix": [5, 2], "x": 4.5, "y": 2 },
-                { "label":"B", "matrix": [6, 2], "x": 5.5, "y": 2 },
-                { "label":"N", "matrix": [4, 3], "x": 6.5, "y": 2 },
-                { "label":"M", "matrix": [5, 3], "x": 7.5, "y": 2 },
-                { "label":"COMM", "matrix": [4, 4], "x": 8.5, "y": 2 },
-                { "label":"DOT", "matrix": [5, 4], "x": 9.5, "y": 2 },
-                { "label":"SLSH", "matrix": [4, 5], "x": 10.5, "y": 2 },
-                { "label":"RSFT", "matrix": [5, 5], "w": 1.75, "x": 11.5, "y": 2 },
+                {"label": "LSFT", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 2},
+                {"label": "Z", "matrix": [5, 0], "x": 1.5, "y": 2},
+                {"label": "X", "matrix": [4, 1], "x": 2.5, "y": 2},
+                {"label": "C", "matrix": [5, 1], "x": 3.5, "y": 2},
+                {"label": "V", "matrix": [5, 2], "x": 4.5, "y": 2},
+                {"label": "B", "matrix": [6, 2], "x": 5.5, "y": 2},
+                {"label": "N", "matrix": [4, 3], "x": 6.5, "y": 2},
+                {"label": "M", "matrix": [5, 3], "x": 7.5, "y": 2},
+                {"label": "COMM", "matrix": [4, 4], "x": 8.5, "y": 2},
+                {"label": "DOT", "matrix": [5, 4], "x": 9.5, "y": 2},
+                {"label": "SLSH", "matrix": [4, 5], "x": 10.5, "y": 2},
+                {"label": "RSFT", "matrix": [5, 5], "w": 1.75, "x": 11.5, "y": 2},
 
-                { "label":"CAPS", "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3 },
-                { "label":"LCTL", "matrix": [7, 0], "x": 1.25, "y": 3 },
-                { "label":"LGUI", "matrix": [6, 1], "x": 2.25, "y": 3 },
-                { "label":"LALT", "matrix": [7, 1], "x": 3.25, "y": 3 },
-                { "label":"SPC", "matrix": [7, 2], "w": 2, "x": 4.25, "y": 3 },
-                { "label":"SPC", "matrix": [6, 3], "w": 2, "x": 6.25, "y": 3 },
-                { "label":"DEL", "matrix": [7, 3], "x": 8.25, "y": 3 },
-                { "label":"LEFT", "matrix": [6, 4], "x": 9.25, "y": 3 },
-                { "label":"UP", "matrix": [7, 4], "x": 10.25, "y": 3 },
-                { "label":"DOWN", "matrix": [6, 5], "x": 11.25, "y": 3 },
-                { "label":"RGHT", "matrix": [7, 5], "x": 12.25, "y": 3 }
+                {"label": "CAPS", "matrix": [6, 0], "w": 1.25, "x": 0, "y": 3},
+                {"label": "LCTL", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "LGUI", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "LALT", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "SPC", "matrix": [7, 2], "w": 2, "x": 4.25, "y": 3},
+                {"label": "SPC", "matrix": [6, 3], "w": 2, "x": 6.25, "y": 3},
+                {"label": "DEL", "matrix": [7, 3], "x": 8.25, "y": 3},
+                {"label": "LEFT", "matrix": [6, 4], "x": 9.25, "y": 3},
+                {"label": "UP", "matrix": [7, 4], "x": 10.25, "y": 3},
+                {"label": "DOWN", "matrix": [6, 5], "x": 11.25, "y": 3},
+                {"label": "RGHT", "matrix": [7, 5], "x": 12.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/miniaxe/info.json b/keyboards/miniaxe/info.json
index 4847749582..6f6c68d8d0 100644
--- a/keyboards/miniaxe/info.json
+++ b/keyboards/miniaxe/info.json
@@ -31,49 +31,49 @@
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
 
-                {"x":6, "y":0, "matrix": [4, 0]},
-                {"x":7, "y":0, "matrix": [4, 1]},
-                {"x":8, "y":0, "matrix": [4, 2]},
-                {"x":9, "y":0, "matrix": [4, 3]},
-                {"x":10, "y":0, "matrix": [4, 4]},
+                {"x": 6, "y": 0, "matrix": [4, 0]},
+                {"x": 7, "y": 0, "matrix": [4, 1]},
+                {"x": 8, "y": 0, "matrix": [4, 2]},
+                {"x": 9, "y": 0, "matrix": [4, 3]},
+                {"x": 10, "y": 0, "matrix": [4, 4]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
 
-                {"x":6, "y":1, "matrix": [5, 0]},
-                {"x":7, "y":1, "matrix": [5, 1]},
-                {"x":8, "y":1, "matrix": [5, 2]},
-                {"x":9, "y":1, "matrix": [5, 3]},
-                {"x":10, "y":1, "matrix": [5, 4]},
+                {"x": 6, "y": 1, "matrix": [5, 0]},
+                {"x": 7, "y": 1, "matrix": [5, 1]},
+                {"x": 8, "y": 1, "matrix": [5, 2]},
+                {"x": 9, "y": 1, "matrix": [5, 3]},
+                {"x": 10, "y": 1, "matrix": [5, 4]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
-                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
 
-                {"x":6, "y":2, "matrix": [6, 0]},
-                {"x":7, "y":2, "matrix": [6, 1]},
-                {"x":8, "y":2, "matrix": [6, 2]},
-                {"x":9, "y":2, "matrix": [6, 3]},
-                {"x":10, "y":2, "matrix": [6, 4]},
+                {"x": 6, "y": 2, "matrix": [6, 0]},
+                {"x": 7, "y": 2, "matrix": [6, 1]},
+                {"x": 8, "y": 2, "matrix": [6, 2]},
+                {"x": 9, "y": 2, "matrix": [6, 3]},
+                {"x": 10, "y": 2, "matrix": [6, 4]},
 
-                {"x":2, "y":3, "matrix": [3, 0]},
-                {"x":3, "y":3, "matrix": [3, 1]},
-                {"x":4, "y":3, "matrix": [3, 2]},
+                {"x": 2, "y": 3, "matrix": [3, 0]},
+                {"x": 3, "y": 3, "matrix": [3, 1]},
+                {"x": 4, "y": 3, "matrix": [3, 2]},
 
-                {"x":6, "y":3, "matrix": [7, 0]},
-                {"x":7, "y":3, "matrix": [7, 1]},
-                {"x":8, "y":3, "matrix": [7, 2]}
+                {"x": 6, "y": 3, "matrix": [7, 0]},
+                {"x": 7, "y": 3, "matrix": [7, 1]},
+                {"x": 8, "y": 3, "matrix": [7, 2]}
             ]
         }
     }
diff --git a/keyboards/minimacro5/info.json b/keyboards/minimacro5/info.json
index 134b50f017..e417a689ae 100644
--- a/keyboards/minimacro5/info.json
+++ b/keyboards/minimacro5/info.json
@@ -30,11 +30,11 @@
   "layouts": {
     "LAYOUT_ortho_1x5": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]}
       ]
     }
   }
diff --git a/keyboards/mino_plus/soldered/info.json b/keyboards/mino_plus/soldered/info.json
index 5c6a3d77d8..52b612e01b 100644
--- a/keyboards/mino_plus/soldered/info.json
+++ b/keyboards/mino_plus/soldered/info.json
@@ -13,30 +13,8 @@
         "nkro": true
     },
     "matrix_pins": {
-        "cols": [
-            "B4",
-            "B3",
-            "A15",
-            "A10",
-            "A8",
-            "B14",
-            "B12",
-            "B10",
-            "A5",
-            "A4",
-            "A3",
-            "B0",
-            "A7",
-            "C15",
-            "B5"
-        ],
-        "rows": [
-            "B9",
-            "B8",
-            "A2",
-            "A1",
-            "A0"
-        ]
+        "cols": ["B4", "B3", "A15", "A10", "A8", "B14", "B12", "B10", "A5", "A4", "A3", "B0", "A7", "C15", "B5"],
+        "rows": ["B9", "B8", "A2", "A1", "A0"]
     },
     "processor": "STM32F072",
     "url": "",
diff --git a/keyboards/mixi/info.json b/keyboards/mixi/info.json
index cd8e02195e..aa31b758e9 100644
--- a/keyboards/mixi/info.json
+++ b/keyboards/mixi/info.json
@@ -29,15 +29,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]}
             ]
         }
     }
diff --git a/keyboards/montsinger/rebound/rev2/info.json b/keyboards/montsinger/rebound/rev2/info.json
index 4a98f62a2f..f09cb7f75f 100644
--- a/keyboards/montsinger/rebound/rev2/info.json
+++ b/keyboards/montsinger/rebound/rev2/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard":"Rebound Rev2",
+    "keyboard": "Rebound Rev2",
     "manufacturer": "Montsinger",
     "url": "https://montsinger.net",
     "maintainer": "rossman360",
diff --git a/keyboards/montsinger/rebound/rev3/info.json b/keyboards/montsinger/rebound/rev3/info.json
index 8f4dee862e..b898407f82 100644
--- a/keyboards/montsinger/rebound/rev3/info.json
+++ b/keyboards/montsinger/rebound/rev3/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard":"Rebound Rev3",
+    "keyboard": "Rebound Rev3",
     "manufacturer": "Montsinger",
     "url": "https://montsinger.net",
     "maintainer": "rossman360",
diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json
index fbee96edc7..9f4e89497e 100644
--- a/keyboards/montsinger/rebound/rev4/info.json
+++ b/keyboards/montsinger/rebound/rev4/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard":"Rebound Rev4",
+    "keyboard": "Rebound Rev4",
     "manufacturer": "Montsinger",
     "url": "https://montsinger.net",
     "maintainer": "rossman360",
diff --git a/keyboards/montsinger/rewind/info.json b/keyboards/montsinger/rewind/info.json
index d034f95b52..6e56b3de3b 100644
--- a/keyboards/montsinger/rewind/info.json
+++ b/keyboards/montsinger/rewind/info.json
@@ -1,5 +1,5 @@
  {
-    "keyboard":"Rewind",
+    "keyboard": "Rewind",
     "manufacturer": "Montsinger",
     "url": "https://montsinger.net",
     "maintainer": "rossman360",
diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json
index 3e433aff92..baa73a6e3b 100644
--- a/keyboards/mwstudio/mw65_black/info.json
+++ b/keyboards/mwstudio/mw65_black/info.json
@@ -29,153 +29,153 @@
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
-                {"x":15, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+                {"x": 15, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 13]},
-                {"x":15, "y":1, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 13]},
+                {"x": 15, "y": 1, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 13]},
-                {"x":15, "y":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 13]},
+                {"x": 15, "y": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 1]},
-                {"x":3.25, "y":3, "matrix": [3, 2]},
-                {"x":4.25, "y":3, "matrix": [3, 3]},
-                {"x":5.25, "y":3, "matrix": [3, 4]},
-                {"x":6.25, "y":3, "matrix": [3, 5]},
-                {"x":7.25, "y":3, "matrix": [3, 6]},
-                {"x":8.25, "y":3, "matrix": [3, 7]},
-                {"x":9.25, "y":3, "matrix": [3, 8]},
-                {"x":10.25, "y":3, "matrix": [3, 9]},
-                {"x":11.25, "y":3, "matrix": [3, 10]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 11]},
-                {"x":14, "y":3, "matrix": [3, 13]},
-                {"x":15, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 1]},
+                {"x": 3.25, "y": 3, "matrix": [3, 2]},
+                {"x": 4.25, "y": 3, "matrix": [3, 3]},
+                {"x": 5.25, "y": 3, "matrix": [3, 4]},
+                {"x": 6.25, "y": 3, "matrix": [3, 5]},
+                {"x": 7.25, "y": 3, "matrix": [3, 6]},
+                {"x": 8.25, "y": 3, "matrix": [3, 7]},
+                {"x": 9.25, "y": 3, "matrix": [3, 8]},
+                {"x": 10.25, "y": 3, "matrix": [3, 9]},
+                {"x": 11.25, "y": 3, "matrix": [3, 10]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 11]},
+                {"x": 14, "y": 3, "matrix": [3, 13]},
+                {"x": 15, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.25, "matrix": [4, 0]},
-                {"x":1.25, "y":4, "w":1.25, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.25, "matrix": [4, 2]},
-                {"x":3.75, "y":4, "w":6.25, "matrix": [4, 5]},
-                {"x":10, "y":4, "w":1.25, "matrix": [4, 9]},
-                {"x":11.25, "y":4, "w":1.25, "matrix": [4, 10]},
-                {"x":13, "y":4, "matrix": [4, 12]},
-                {"x":14, "y":4, "matrix": [4, 13]},
-                {"x":15, "y":4, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+                {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 9]},
+                {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 10]},
+                {"x": 13, "y": 4, "matrix": [4, 12]},
+                {"x": 14, "y": 4, "matrix": [4, 13]},
+                {"x": 15, "y": 4, "matrix": [4, 14]}
             ]
         },
         "LAYOUT_65_ansi_blocker_tsangan": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "matrix": [0, 11]},
-                {"x":12, "y":0, "matrix": [0, 12]},
-                {"x":13, "y":0, "w":2, "matrix": [0, 13]},
-                {"x":15, "y":0, "matrix": [0, 14]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "matrix": [0, 11]},
+                {"x": 12, "y": 0, "matrix": [0, 12]},
+                {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+                {"x": 15, "y": 0, "matrix": [0, 14]},
 
-                {"x":0, "y":1, "w":1.5, "matrix": [1, 0]},
-                {"x":1.5, "y":1, "matrix": [1, 1]},
-                {"x":2.5, "y":1, "matrix": [1, 2]},
-                {"x":3.5, "y":1, "matrix": [1, 3]},
-                {"x":4.5, "y":1, "matrix": [1, 4]},
-                {"x":5.5, "y":1, "matrix": [1, 5]},
-                {"x":6.5, "y":1, "matrix": [1, 6]},
-                {"x":7.5, "y":1, "matrix": [1, 7]},
-                {"x":8.5, "y":1, "matrix": [1, 8]},
-                {"x":9.5, "y":1, "matrix": [1, 9]},
-                {"x":10.5, "y":1, "matrix": [1, 10]},
-                {"x":11.5, "y":1, "matrix": [1, 11]},
-                {"x":12.5, "y":1, "matrix": [1, 12]},
-                {"x":13.5, "y":1, "w":1.5, "matrix": [1, 13]},
-                {"x":15, "y":1, "matrix": [1, 14]},
+                {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+                {"x": 1.5, "y": 1, "matrix": [1, 1]},
+                {"x": 2.5, "y": 1, "matrix": [1, 2]},
+                {"x": 3.5, "y": 1, "matrix": [1, 3]},
+                {"x": 4.5, "y": 1, "matrix": [1, 4]},
+                {"x": 5.5, "y": 1, "matrix": [1, 5]},
+                {"x": 6.5, "y": 1, "matrix": [1, 6]},
+                {"x": 7.5, "y": 1, "matrix": [1, 7]},
+                {"x": 8.5, "y": 1, "matrix": [1, 8]},
+                {"x": 9.5, "y": 1, "matrix": [1, 9]},
+                {"x": 10.5, "y": 1, "matrix": [1, 10]},
+                {"x": 11.5, "y": 1, "matrix": [1, 11]},
+                {"x": 12.5, "y": 1, "matrix": [1, 12]},
+                {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 13]},
+                {"x": 15, "y": 1, "matrix": [1, 14]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "matrix": [2, 10]},
-                {"x":11.75, "y":2, "matrix": [2, 11]},
-                {"x":12.75, "y":2, "matrix": [2, 12]},
-                {"x":13.75, "y":2, "w":1.25, "matrix": [2, 13]},
-                {"x":15, "y":2, "matrix": [2, 14]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "matrix": [2, 10]},
+                {"x": 11.75, "y": 2, "matrix": [2, 11]},
+                {"x": 12.75, "y": 2, "matrix": [2, 12]},
+                {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 13]},
+                {"x": 15, "y": 2, "matrix": [2, 14]},
 
-                {"x":0, "y":3, "w":2.25, "matrix": [3, 0]},
-                {"x":2.25, "y":3, "matrix": [3, 1]},
-                {"x":3.25, "y":3, "matrix": [3, 2]},
-                {"x":4.25, "y":3, "matrix": [3, 3]},
-                {"x":5.25, "y":3, "matrix": [3, 4]},
-                {"x":6.25, "y":3, "matrix": [3, 5]},
-                {"x":7.25, "y":3, "matrix": [3, 6]},
-                {"x":8.25, "y":3, "matrix": [3, 7]},
-                {"x":9.25, "y":3, "matrix": [3, 8]},
-                {"x":10.25, "y":3, "matrix": [3, 9]},
-                {"x":11.25, "y":3, "matrix": [3, 10]},
-                {"x":12.25, "y":3, "w":1.75, "matrix": [3, 11]},
-                {"x":14, "y":3, "matrix": [3, 13]},
-                {"x":15, "y":3, "matrix": [3, 14]},
+                {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+                {"x": 2.25, "y": 3, "matrix": [3, 1]},
+                {"x": 3.25, "y": 3, "matrix": [3, 2]},
+                {"x": 4.25, "y": 3, "matrix": [3, 3]},
+                {"x": 5.25, "y": 3, "matrix": [3, 4]},
+                {"x": 6.25, "y": 3, "matrix": [3, 5]},
+                {"x": 7.25, "y": 3, "matrix": [3, 6]},
+                {"x": 8.25, "y": 3, "matrix": [3, 7]},
+                {"x": 9.25, "y": 3, "matrix": [3, 8]},
+                {"x": 10.25, "y": 3, "matrix": [3, 9]},
+                {"x": 11.25, "y": 3, "matrix": [3, 10]},
+                {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 11]},
+                {"x": 14, "y": 3, "matrix": [3, 13]},
+                {"x": 15, "y": 3, "matrix": [3, 14]},
 
-                {"x":0, "y":4, "w":1.5, "matrix": [4, 0]},
-                {"x":1.5, "y":4, "matrix": [4, 1]},
-                {"x":2.5, "y":4, "w":1.5, "matrix": [4, 2]},
-                {"x":4, "y":4, "w":7, "matrix": [4, 5]},
-                {"x":11, "y":4, "w":1.5, "matrix": [4, 10]},
-                {"x":13, "y":4, "matrix": [4, 12]},
-                {"x":14, "y":4, "matrix": [4, 13]},
-                {"x":15, "y":4, "matrix": [4, 14]}
+                {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+                {"x": 1.5, "y": 4, "matrix": [4, 1]},
+                {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+                {"x": 4, "y": 4, "w": 7, "matrix": [4, 5]},
+                {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 10]},
+                {"x": 13, "y": 4, "matrix": [4, 12]},
+                {"x": 14, "y": 4, "matrix": [4, 13]},
+                {"x": 15, "y": 4, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json
index 9d08b0277c..5d1edb296f 100644
--- a/keyboards/mwstudio/mw660/info.json
+++ b/keyboards/mwstudio/mw660/info.json
@@ -31,77 +31,77 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [0, 4], "x": 4, "y": 0 },
-                { "matrix": [0, 5], "x": 5, "y": 0 },
-                { "matrix": [0, 6], "x": 6, "y": 0 },
-                { "matrix": [0, 7], "x": 7, "y": 0 },
-                { "matrix": [0, 8], "x": 8, "y": 0 },
-                { "matrix": [0, 9], "x": 9, "y": 0 },
-                { "matrix": [0, 10], "x": 10, "y": 0 },
-                { "matrix": [0, 11], "x": 11, "y": 0 },
-                { "matrix": [0, 12], "x": 12, "y": 0 },
-                { "matrix": [0, 13], "x": 13, "y": 0, "w": 2 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
 
-                { "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5 },
-                { "matrix": [1, 1], "x": 1.5, "y": 1 },
-                { "matrix": [1, 2], "x": 2.5, "y": 1 },
-                { "matrix": [1, 3], "x": 3.5, "y": 1 },
-                { "matrix": [1, 4], "x": 4.5, "y": 1 },
-                { "matrix": [1, 5], "x": 5.5, "y": 1 },
-                { "matrix": [1, 6], "x": 6.5, "y": 1 },
-                { "matrix": [1, 7], "x": 7.5, "y": 1 },
-                { "matrix": [1, 8], "x": 8.5, "y": 1 },
-                { "matrix": [1, 9], "x": 9.5, "y": 1 },
-                { "matrix": [1, 10], "x": 10.5, "y": 1 },
-                { "matrix": [1, 11], "x": 11.5, "y": 1 },
-                { "matrix": [1, 12], "x": 12.5, "y": 1 },
-                { "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 },
-                { "matrix": [1, 14], "x": 15.25, "y": 1 },
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
 
-                { "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75 },
-                { "matrix": [2, 1], "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25 },
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
 
-                { "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
-                { "matrix": [3, 2], "x": 2.25, "y": 3},
-                { "matrix": [3, 3], "x": 3.25, "y": 3},
-                { "matrix": [3, 4], "x": 4.25, "y": 3},
-                { "matrix": [3, 5], "x": 5.25, "y": 3},
-                { "matrix": [3, 6], "x": 6.25, "y": 3},
-                { "matrix": [3, 7], "x": 7.25, "y": 3},
-                { "matrix": [3, 8], "x": 8.25, "y": 3},
-                { "matrix": [3, 9], "x": 9.25, "y": 3},
-                { "matrix": [3, 10], "x": 10.25, "y": 3},
-                { "matrix": [3, 11], "x": 11.25, "y": 3},
-                { "matrix": [3, 12], "x": 12.25, "y": 3, "w":2},
-                { "matrix": [3, 13], "x": 14.25, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+                {"matrix": [3, 13], "x": 14.25, "y": 3},
 
-                { "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
-                { "matrix": [4, 1], "x": 1.5, "y": 4},
-                { "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
-                { "matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
-                { "matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
-                { "matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
-                { "matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.5},
-                { "matrix": [4, 11], "x": 11.75, "y": 4},
-                { "matrix": [4, 12], "x": 13.25, "y": 4},
-                { "matrix": [4, 13], "x": 14.25, "y": 4},
-                { "matrix": [4, 14], "x": 15.25, "y": 4}
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75},
+                {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 8, "y": 4, "w": 2.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4},
+                {"matrix": [4, 12], "x": 13.25, "y": 4},
+                {"matrix": [4, 13], "x": 14.25, "y": 4},
+                {"matrix": [4, 14], "x": 15.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/info.json
index 7e17fa35ea..829e97591c 100644
--- a/keyboards/mwstudio/mw80/info.json
+++ b/keyboards/mwstudio/mw80/info.json
@@ -57,99 +57,99 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1.25, "y": 0 },
-                { "matrix": [0, 2], "x": 2.25, "y": 0 },
-                { "matrix": [0, 3], "x": 3.25, "y": 0 },
-                { "matrix": [0, 4], "x": 4.25, "y": 0 },
-                { "matrix": [0, 5], "x": 5.5, "y": 0 },
-                { "matrix": [0, 6], "x": 6.5, "y": 0 },
-                { "matrix": [0, 7], "x": 7.5, "y": 0 },
-                { "matrix": [0, 8], "x": 8.5, "y": 0 },
-                { "matrix": [0, 9], "x": 9.75, "y": 0 },
-                { "matrix": [0, 10], "x": 10.75, "y": 0 },
-                { "matrix": [0, 11], "x": 11.75, "y": 0 },
-                { "matrix": [0, 12], "x": 12.75, "y": 0 },
-                { "matrix": [0, 13], "x": 14, "y": 0 },
-                { "matrix": [0, 14], "x": 15.25, "y": 0 },
-                { "matrix": [0, 15], "x": 16.25, "y": 0 },
-                { "matrix": [0, 16], "x": 17.25, "y": 0 },
+                {"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, "w": 2 },
-                { "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": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+                {"matrix": [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], "x": 0, "y": 2.25, "w": 1.5 },
-                { "matrix": [2, 1], "x": 1.5, "y": 2.25 },
-                { "matrix": [2, 2], "x": 2.5, "y": 2.25 },
-                { "matrix": [2, 3], "x": 3.5, "y": 2.25 },
-                { "matrix": [2, 4], "x": 4.5, "y": 2.25 },
-                { "matrix": [2, 5], "x": 5.5, "y": 2.25 },
-                { "matrix": [2, 6], "x": 6.5, "y": 2.25 },
-                { "matrix": [2, 7], "x": 7.5, "y": 2.25 },
-                { "matrix": [2, 8], "x": 8.5, "y": 2.25 },
-                { "matrix": [2, 9], "x": 9.5, "y": 2.25 },
-                { "matrix": [2, 10], "x": 10.5, "y": 2.25 },
-                { "matrix": [2, 11], "x": 11.5, "y": 2.25 },
-                { "matrix": [2, 12], "x": 12.5, "y": 2.25 },
-                { "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "matrix": [2, 14], "x": 15.25, "y": 2.25 },
-                { "matrix": [2, 15], "x": 16.25, "y": 2.25 },
-                { "matrix": [2, 16], "x": 17.25, "y": 2.25 },
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.25},
 
-                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 },
-                { "matrix": [3, 1], "x": 1.75, "y": 3.25 },
-                { "matrix": [3, 2], "x": 2.75, "y": 3.25 },
-                { "matrix": [3, 3], "x": 3.75, "y": 3.25 },
-                { "matrix": [3, 4], "x": 4.75, "y": 3.25 },
-                { "matrix": [3, 5], "x": 5.75, "y": 3.25 },
-                { "matrix": [3, 6], "x": 6.75, "y": 3.25 },
-                { "matrix": [3, 7], "x": 7.75, "y": 3.25 },
-                { "matrix": [3, 8], "x": 8.75, "y": 3.25 },
-                { "matrix": [3, 9], "x": 9.75, "y": 3.25 },
-                { "matrix": [3, 10], "x": 10.75, "y": 3.25 },
-                { "matrix": [3, 11], "x": 11.75, "y": 3.25 },
-                { "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25 },
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
 
-                { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
-                { "matrix": [4, 2], "x": 2.25, "y": 4.25},
-                { "matrix": [4, 3], "x": 3.25, "y": 4.25},
-                { "matrix": [4, 4], "x": 4.25, "y": 4.25},
-                { "matrix": [4, 5], "x": 5.25, "y": 4.25},
-                { "matrix": [4, 6], "x": 6.25, "y": 4.25},
-                { "matrix": [4, 7], "x": 7.25, "y": 4.25},
-                { "matrix": [4, 8], "x": 8.25, "y": 4.25},
-                { "matrix": [4, 9], "x": 9.25, "y": 4.25},
-                { "matrix": [4, 10], "x": 10.25, "y": 4.25},
-                { "matrix": [4, 11], "x": 11.25, "y": 4.25},
-                { "matrix": [4, 13], "x": 12.25, "y": 4.25, "w":2.75},
-                { "matrix": [4, 15], "x": 16.25, "y": 4.25},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 15], "x": 16.25, "y": 4.25},
 
-                { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
-                { "matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
-                { "matrix": [5, 14], "x": 15.25, "y": 5.25},
-                { "matrix": [5, 15], "x": 16.25, "y": 5.25},
-                { "matrix": [5, 16], "x": 17.25, "y": 5.25}
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 16], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
index 3bb6933b4c..9cbf0bf648 100644
--- a/keyboards/nixkeyboards/day_off/info.json
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -26,76 +26,76 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"~", "x":1.5, "y":0, "matrix":[0, 1]},
-                {"label":"!", "x":2.5, "y":0, "matrix":[0, 2]},
-                {"label":"@", "x":3.5, "y":0, "matrix":[0, 3]},
-                {"label":"#", "x":4.5, "y":0, "matrix":[0, 4]},
-                {"label":"$", "x":5.5, "y":0, "matrix":[0, 5]},
-                {"label":"%", "x":6.5, "y":0, "matrix":[0, 6]},
-                {"label":"^", "x":7.5, "y":0, "matrix":[0, 7]},
-                {"label":"&", "x":8.5, "y":0, "matrix":[0, 8]},
-                {"label":"*", "x":9.5, "y":0, "matrix":[0, 9]},
-                {"label":"(", "x":10.5, "y":0, "matrix":[0, 10]},
-                {"label":")", "x":11.5, "y":0, "matrix":[0, 11]},
-                {"label":"_", "x":12.5, "y":0, "matrix":[0, 12]},
-                {"label":"+", "x":13.5, "y":0, "matrix":[0, 13]},
-                {"label":"Bksp", "x":14.5, "y":0, "matrix":[0, 14]},
-                {"label":"Del", "x":15.5, "y":0, "matrix":[1, 1]},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5, "matrix":[1, 2]},
-                {"label":"Q", "x":3, "y":1, "matrix":[1, 3]},
-                {"label":"W", "x":4, "y":1, "matrix":[1, 4]},
-                {"label":"E", "x":5, "y":1, "matrix":[1, 5]},
-                {"label":"R", "x":6, "y":1, "matrix":[1, 6]},
-                {"label":"T", "x":7, "y":1, "matrix":[1, 7]},
-                {"label":"Y", "x":8, "y":1, "matrix":[1, 8]},
-                {"label":"U", "x":9, "y":1, "matrix":[1, 9]},
-                {"label":"I", "x":10, "y":1, "matrix":[1, 10]},
-                {"label":"O", "x":11, "y":1, "matrix":[1, 11]},
-                {"label":"P", "x":12, "y":1, "matrix":[1, 12]},
-                {"label":"{", "x":13, "y":1, "matrix":[1, 13]},
-                {"label":"}", "x":14, "y":1, "matrix":[1, 14]},
-                {"label":"|", "x":15, "y":1, "w":1.5, "matrix":[2, 0]},
-                {"label":"M1", "x":0, "y":2, "matrix":[2, 1]},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75, "matrix":[2, 2]},
-                {"label":"A", "x":3.25, "y":2, "matrix":[2, 3]},
-                {"label":"S", "x":4.25, "y":2, "matrix":[2, 4]},
-                {"label":"D", "x":5.25, "y":2, "matrix":[2, 5]},
-                {"label":"F", "x":6.25, "y":2, "matrix":[2, 6]},
-                {"label":"G", "x":7.25, "y":2, "matrix":[2, 7]},
-                {"label":"H", "x":8.25, "y":2, "matrix":[2, 8]},
-                {"label":"J", "x":9.25, "y":2, "matrix":[2, 9]},
-                {"label":"K", "x":10.25, "y":2, "matrix":[2, 10]},
-                {"label":"L", "x":11.25, "y":2, "matrix":[2, 11]},
-                {"label":":", "x":12.25, "y":2, "matrix":[2, 12]},
-                {"label":"\"", "x":13.25, "y":2, "matrix":[2, 13]},
-                {"label":"Enter", "x":14.25, "y":2, "w":2.25, "matrix":[2, 14]},
-                {"label":"M2", "x":0, "y":3, "matrix":[3, 0]},
-                {"label":"", "x":1.5, "y":3, "w":1.25, "matrix":[3, 1]},
-                {"label":"Shift", "x":2.75, "y":3, "matrix":[3, 2]},
-                {"label":"Z", "x":3.75, "y":3, "matrix":[3, 3]},
-                {"label":"X", "x":4.75, "y":3, "matrix":[3, 4]},
-                {"label":"C", "x":5.75, "y":3, "matrix":[3, 5]},
-                {"label":"V", "x":6.75, "y":3, "matrix":[3, 6]},
-                {"label":"B", "x":7.75, "y":3, "matrix":[3, 7]},
-                {"label":"N", "x":8.75, "y":3, "matrix":[3, 8]},
-                {"label":"M", "x":9.75, "y":3, "matrix":[3, 9]},
-                {"label":"<", "x":10.75, "y":3, "matrix":[3, 10]},
-                {"label":">", "x":11.75, "y":3, "matrix":[3, 11]},
-                {"label":"?", "x":12.75, "y":3, "matrix":[3, 12]},
-                {"label":"Shift", "x":13.75, "y":3, "w":1.75, "matrix":[3, 13]},
-                {"label":"", "x":15.5, "y":3, "matrix":[3, 14]},
-                {"label":"M3", "x":0, "y":4, "matrix":[4, 0]},
-                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25, "matrix":[4, 1]},
-                {"label":"Win", "x":2.75, "y":4, "w":1.25, "matrix":[4, 2]},
-                {"label":"Alt", "x":4, "y":4, "w":1.25, "matrix":[4, 3]},
-                {"label":"Space", "x":5.25, "y":4, "w":6.25, "matrix":[4, 5]},
-                {"label":"Space", "x":5.25, "y":4, "w":2.25, "matrix":[4, 7]},
-                {"label":"Mod", "x":7.5, "y":4, "w":1.25, "matrix":[4, 8]},
-                {"label":"Space", "x":8.75, "y":4, "w":2.25, "matrix":[4, 10]},
-                {"label":"Alt", "x":11.5, "y":4, "w":1.25, "matrix":[4, 11]},
-                {"label":"Win", "x":12.75, "y":4, "w":1.25, "matrix":[4, 12]},
-                {"label":"Menu", "x":14, "y":4, "w":1.25, "matrix":[4, 13]},
-                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25, "matrix":[4, 14]}
+                {"label": "~", "x": 1.5, "y": 0, "matrix": [0, 1]},
+                {"label": "!", "x": 2.5, "y": 0, "matrix": [0, 2]},
+                {"label": "@", "x": 3.5, "y": 0, "matrix": [0, 3]},
+                {"label": "#", "x": 4.5, "y": 0, "matrix": [0, 4]},
+                {"label": "$", "x": 5.5, "y": 0, "matrix": [0, 5]},
+                {"label": "%", "x": 6.5, "y": 0, "matrix": [0, 6]},
+                {"label": "^", "x": 7.5, "y": 0, "matrix": [0, 7]},
+                {"label": "&", "x": 8.5, "y": 0, "matrix": [0, 8]},
+                {"label": "*", "x": 9.5, "y": 0, "matrix": [0, 9]},
+                {"label": "(", "x": 10.5, "y": 0, "matrix": [0, 10]},
+                {"label": ")", "x": 11.5, "y": 0, "matrix": [0, 11]},
+                {"label": "_", "x": 12.5, "y": 0, "matrix": [0, 12]},
+                {"label": "+", "x": 13.5, "y": 0, "matrix": [0, 13]},
+                {"label": "Bksp", "x": 14.5, "y": 0, "matrix": [0, 14]},
+                {"label": "Del", "x": 15.5, "y": 0, "matrix": [1, 1]},
+                {"label": "Tab", "x": 1.5, "y": 1, "w": 1.5, "matrix": [1, 2]},
+                {"label": "Q", "x": 3, "y": 1, "matrix": [1, 3]},
+                {"label": "W", "x": 4, "y": 1, "matrix": [1, 4]},
+                {"label": "E", "x": 5, "y": 1, "matrix": [1, 5]},
+                {"label": "R", "x": 6, "y": 1, "matrix": [1, 6]},
+                {"label": "T", "x": 7, "y": 1, "matrix": [1, 7]},
+                {"label": "Y", "x": 8, "y": 1, "matrix": [1, 8]},
+                {"label": "U", "x": 9, "y": 1, "matrix": [1, 9]},
+                {"label": "I", "x": 10, "y": 1, "matrix": [1, 10]},
+                {"label": "O", "x": 11, "y": 1, "matrix": [1, 11]},
+                {"label": "P", "x": 12, "y": 1, "matrix": [1, 12]},
+                {"label": "{", "x": 13, "y": 1, "matrix": [1, 13]},
+                {"label": "}", "x": 14, "y": 1, "matrix": [1, 14]},
+                {"label": "|", "x": 15, "y": 1, "w": 1.5, "matrix": [2, 0]},
+                {"label": "M1", "x": 0, "y": 2, "matrix": [2, 1]},
+                {"label": "Caps Lock", "x": 1.5, "y": 2, "w": 1.75, "matrix": [2, 2]},
+                {"label": "A", "x": 3.25, "y": 2, "matrix": [2, 3]},
+                {"label": "S", "x": 4.25, "y": 2, "matrix": [2, 4]},
+                {"label": "D", "x": 5.25, "y": 2, "matrix": [2, 5]},
+                {"label": "F", "x": 6.25, "y": 2, "matrix": [2, 6]},
+                {"label": "G", "x": 7.25, "y": 2, "matrix": [2, 7]},
+                {"label": "H", "x": 8.25, "y": 2, "matrix": [2, 8]},
+                {"label": "J", "x": 9.25, "y": 2, "matrix": [2, 9]},
+                {"label": "K", "x": 10.25, "y": 2, "matrix": [2, 10]},
+                {"label": "L", "x": 11.25, "y": 2, "matrix": [2, 11]},
+                {"label": ":", "x": 12.25, "y": 2, "matrix": [2, 12]},
+                {"label": "\"", "x": 13.25, "y": 2, "matrix": [2, 13]},
+                {"label": "Enter", "x": 14.25, "y": 2, "w": 2.25, "matrix": [2, 14]},
+                {"label": "M2", "x": 0, "y": 3, "matrix": [3, 0]},
+                {"label": "", "x": 1.5, "y": 3, "w": 1.25, "matrix": [3, 1]},
+                {"label": "Shift", "x": 2.75, "y": 3, "matrix": [3, 2]},
+                {"label": "Z", "x": 3.75, "y": 3, "matrix": [3, 3]},
+                {"label": "X", "x": 4.75, "y": 3, "matrix": [3, 4]},
+                {"label": "C", "x": 5.75, "y": 3, "matrix": [3, 5]},
+                {"label": "V", "x": 6.75, "y": 3, "matrix": [3, 6]},
+                {"label": "B", "x": 7.75, "y": 3, "matrix": [3, 7]},
+                {"label": "N", "x": 8.75, "y": 3, "matrix": [3, 8]},
+                {"label": "M", "x": 9.75, "y": 3, "matrix": [3, 9]},
+                {"label": "<", "x": 10.75, "y": 3, "matrix": [3, 10]},
+                {"label": ">", "x": 11.75, "y": 3, "matrix": [3, 11]},
+                {"label": "?", "x": 12.75, "y": 3, "matrix": [3, 12]},
+                {"label": "Shift", "x": 13.75, "y": 3, "w": 1.75, "matrix": [3, 13]},
+                {"label": "", "x": 15.5, "y": 3, "matrix": [3, 14]},
+                {"label": "M3", "x": 0, "y": 4, "matrix": [4, 0]},
+                {"label": "Ctrl", "x": 1.5, "y": 4, "w": 1.25, "matrix": [4, 1]},
+                {"label": "Win", "x": 2.75, "y": 4, "w": 1.25, "matrix": [4, 2]},
+                {"label": "Alt", "x": 4, "y": 4, "w": 1.25, "matrix": [4, 3]},
+                {"label": "Space", "x": 5.25, "y": 4, "w": 6.25, "matrix": [4, 5]},
+                {"label": "Space", "x": 5.25, "y": 4, "w": 2.25, "matrix": [4, 7]},
+                {"label": "Mod", "x": 7.5, "y": 4, "w": 1.25, "matrix": [4, 8]},
+                {"label": "Space", "x": 8.75, "y": 4, "w": 2.25, "matrix": [4, 10]},
+                {"label": "Alt", "x": 11.5, "y": 4, "w": 1.25, "matrix": [4, 11]},
+                {"label": "Win", "x": 12.75, "y": 4, "w": 1.25, "matrix": [4, 12]},
+                {"label": "Menu", "x": 14, "y": 4, "w": 1.25, "matrix": [4, 13]},
+                {"label": "Ctrl", "x": 15.25, "y": 4, "w": 1.25, "matrix": [4, 14]}
             ]
         }
     }
diff --git a/keyboards/peranekofactory/tone/rev1/info.json b/keyboards/peranekofactory/tone/rev1/info.json
index 5544f4ac73..5a19b72ffe 100644
--- a/keyboards/peranekofactory/tone/rev1/info.json
+++ b/keyboards/peranekofactory/tone/rev1/info.json
@@ -23,14 +23,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [0, 4]},
-                {"x":1, "y":1, "matrix": [0, 5]},
-                {"x":2, "y":1, "matrix": [0, 6]},
-                {"x":3, "y":1, "matrix": [0, 7]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/peranekofactory/tone/rev2/info.json b/keyboards/peranekofactory/tone/rev2/info.json
index 5544f4ac73..5a19b72ffe 100644
--- a/keyboards/peranekofactory/tone/rev2/info.json
+++ b/keyboards/peranekofactory/tone/rev2/info.json
@@ -23,14 +23,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [0, 4]},
-                {"x":1, "y":1, "matrix": [0, 5]},
-                {"x":2, "y":1, "matrix": [0, 6]},
-                {"x":3, "y":1, "matrix": [0, 7]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 1, "y": 1, "matrix": [0, 5]},
+                {"x": 2, "y": 1, "matrix": [0, 6]},
+                {"x": 3, "y": 1, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index e31a1eb4cd..0edad55f2d 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -25,14 +25,14 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":0, "h":2, "matrix": [0, 6]},
-                {"x":2, "y":0, "h":2, "matrix": [0, 0]},
-                {"x":3, "y":0.25, "h":1.25, "matrix": [0, 1]},
-                {"x":4, "y":0, "h":2, "matrix": [0, 2]},
-                {"x":5, "y":0, "h":2, "matrix": [0, 5]},
-                {"x":0, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [0, 4]},
-                {"x":3, "y":1.5, "matrix": [0, 7]}
+                {"x": 1, "y": 0, "h": 2, "matrix": [0, 6]},
+                {"x": 2, "y": 0, "h": 2, "matrix": [0, 0]},
+                {"x": 3, "y": 0.25, "h": 1.25, "matrix": [0, 1]},
+                {"x": 4, "y": 0, "h": 2, "matrix": [0, 2]},
+                {"x": 5, "y": 0, "h": 2, "matrix": [0, 5]},
+                {"x": 0, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [0, 4]},
+                {"x": 3, "y": 1.5, "matrix": [0, 7]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index ef6682f9e4..2c30755aa1 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -15,11 +15,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
-                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
-                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
-                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
+                {"x": 0, "y": 0, "h": 2, "matrix": [0, 0]},
+                {"x": 1, "y": 0.25, "h": 1.5, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "h": 2, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "h": 2, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0, "h": 2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index 7d040aa5bf..301c8d18ec 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -17,11 +17,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
-                {"x":1, "y":0.25, "h":1.5, "matrix": [0, 1]},
-                {"x":2, "y":0, "h":2, "matrix": [0, 2]},
-                {"x":3.5, "y":0, "h":2, "matrix": [0, 3]},
-                {"x":4.5, "y":0, "h":2, "matrix": [0, 4]}
+                {"x": 0, "y": 0, "h": 2, "matrix": [0, 0]},
+                {"x": 1, "y": 0.25, "h": 1.5, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "h": 2, "matrix": [0, 2]},
+                {"x": 3.5, "y": 0, "h": 2, "matrix": [0, 3]},
+                {"x": 4.5, "y": 0, "h": 2, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_nano/info.json b/keyboards/ploopyco/trackball_nano/info.json
index 5295548573..c1309ad270 100644
--- a/keyboards/ploopyco/trackball_nano/info.json
+++ b/keyboards/ploopyco/trackball_nano/info.json
@@ -15,7 +15,7 @@
      "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]}
+                {"x": 0, "y": 0, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/ploopyco/trackball_thumb/info.json b/keyboards/ploopyco/trackball_thumb/info.json
index d464bc1cd9..72e236a5bb 100644
--- a/keyboards/ploopyco/trackball_thumb/info.json
+++ b/keyboards/ploopyco/trackball_thumb/info.json
@@ -23,12 +23,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 2], "x":1, "y":0, "h":2},
-                {"matrix":[0, 3], "x":2.5, "y":0.25, "h":1.5},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0.5},
-                {"matrix":[0, 1], "x":0, "y":1}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1, "y": 0, "h": 2},
+                {"matrix": [0, 3], "x": 2.5, "y": 0.25, "h": 1.5},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
+                {"matrix": [0, 1], "x": 0, "y": 1}
             ]
         }
     }
diff --git a/keyboards/polycarbdiet/s20/info.json b/keyboards/polycarbdiet/s20/info.json
index c3408f83a3..aeb5427589 100644
--- a/keyboards/polycarbdiet/s20/info.json
+++ b/keyboards/polycarbdiet/s20/info.json
@@ -53,7 +53,7 @@
                 {"matrix": [4, 3], "x": 3, "y": 4}
             ]
         },
-        "LAYOUT_numpad_5x4":{
+        "LAYOUT_numpad_5x4": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/prototypist/oceanographer/info.json b/keyboards/prototypist/oceanographer/info.json
index d32d86ba91..dbec118004 100644
--- a/keyboards/prototypist/oceanographer/info.json
+++ b/keyboards/prototypist/oceanographer/info.json
@@ -12,7 +12,7 @@
         "mousekey": false,
         "nkro": true
     },
-    "encoder":{
+    "encoder": {
         "rotary": [
             {"pin_a": "B2", "pin_b": "B1", "resolution": 2}
         ]
@@ -20,13 +20,13 @@
     "ws2812": {
         "pin": "B3"
     },
-    "rgblight" : {
+    "rgblight": {
         "led_count": 3,
         "sleep": true,
         "hue_steps": 10,
         "saturation_steps": 17,
         "brightness_steps": 17,
-        "animations" : {
+        "animations": {
             "alternating": true,
             "breathing": true
         }
@@ -45,163 +45,163 @@
     "layouts": {
         "LAYOUT_225_1": {
             "layout": [
-                { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
-                { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 },
-                { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 },
-                { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 },
-                { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 },
-                { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 },
-                { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 },
-                { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 },
-                { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 },
-                { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 },
-                { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 },
-                { "matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0 },
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
 
-                { "matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "label": "A", "x": 1.25, "y": 1 },
-                { "matrix": [1, 2], "label": "S", "x": 2.25, "y": 1 },
-                { "matrix": [1, 3], "label": "D", "x": 3.25, "y": 1 },
-                { "matrix": [1, 4], "label": "F", "x": 4.25, "y": 1 },
-                { "matrix": [1, 5], "label": "G", "x": 5.25, "y": 1 },
-                { "matrix": [1, 6], "label": "H", "x": 6.25, "y": 1 },
-                { "matrix": [1, 7], "label": "J", "x": 7.25, "y": 1 },
-                { "matrix": [1, 8], "label": "K", "x": 8.25, "y": 1 },
-                { "matrix": [1, 9], "label": "L", "x": 9.25, "y": 1 },
-                { "matrix": [1, 10], "label": ":", "x": 10.25, "y": 1 },
-                { "matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1 },
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
 
-                { "matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "label": "X", "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "label": "C", "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "label": "V", "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "label": "B", "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "label": "N", "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "label": "M", "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "label": "<", "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "label": ">", "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "label": "?", "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2 },
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
 
-                { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 },
-                { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 },
-                { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 },
-                { "matrix": [3, 3], "label": "Fn", "x": 3, "y": 3 },
-                { "matrix": [3, 5], "w": 2.25, "x": 4, "y": 3 },
-                { "matrix": [3, 6], "w": 2, "x": 6.25, "y": 3 },
-                { "matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3 },
-                { "matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3 },
-                { "matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3 },
-                { "matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3 },
-                { "matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3 }
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 3], "label": "Fn", "x": 3, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 4, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
             ]
         },
         "LAYOUT_225_2": {
             "layout": [
-                { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
-                { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 },
-                { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 },
-                { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 },
-                { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 },
-                { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 },
-                { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 },
-                { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 },
-                { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 },
-                { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 },
-                { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 },
-                { "matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0 },
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
 
-                { "matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "label": "A", "x": 1.25, "y": 1 },
-                { "matrix": [1, 2], "label": "S", "x": 2.25, "y": 1 },
-                { "matrix": [1, 3], "label": "D", "x": 3.25, "y": 1 },
-                { "matrix": [1, 4], "label": "F", "x": 4.25, "y": 1 },
-                { "matrix": [1, 5], "label": "G", "x": 5.25, "y": 1 },
-                { "matrix": [1, 6], "label": "H", "x": 6.25, "y": 1 },
-                { "matrix": [1, 7], "label": "J", "x": 7.25, "y": 1 },
-                { "matrix": [1, 8], "label": "K", "x": 8.25, "y": 1 },
-                { "matrix": [1, 9], "label": "L", "x": 9.25, "y": 1 },
-                { "matrix": [1, 10], "label": ":", "x": 10.25, "y": 1 },
-                { "matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1 },
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
 
-                { "matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "label": "X", "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "label": "C", "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "label": "V", "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "label": "B", "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "label": "N", "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "label": "M", "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "label": "<", "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "label": ">", "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "label": "?", "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2 },
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
 
-                { "matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3 },
-                { "matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3 },
-                { "matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3 },
-                { "matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3 },
-                { "matrix": [3, 6], "w": 2, "x": 5.75, "y": 3 },
-                { "matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3 },
-                { "matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3 },
-                { "matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3 },
-                { "matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3 },
-                { "matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3 }
+                {"matrix": [3, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "w": 1.25, "x": 2.25, "y": 3},
+                {"matrix": [3, 5], "w": 2.25, "x": 3.5, "y": 3},
+                {"matrix": [3, 6], "w": 2, "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "label": "Alt", "w": 1.5, "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
             ]
         },
         "LAYOUT_625": {
             "layout": [
-                { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 },
-                { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 },
-                { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 },
-                { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 },
-                { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 },
-                { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 },
-                { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 },
-                { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 },
-                { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 },
-                { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 },
-                { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 },
-                { "matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0 },
+                {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0},
+                {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0},
+                {"matrix": [0, 2], "label": "W", "x": 2, "y": 0},
+                {"matrix": [0, 3], "label": "E", "x": 3, "y": 0},
+                {"matrix": [0, 4], "label": "R", "x": 4, "y": 0},
+                {"matrix": [0, 5], "label": "T", "x": 5, "y": 0},
+                {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0},
+                {"matrix": [0, 7], "label": "U", "x": 7, "y": 0},
+                {"matrix": [0, 8], "label": "I", "x": 8, "y": 0},
+                {"matrix": [0, 9], "label": "O", "x": 9, "y": 0},
+                {"matrix": [0, 10], "label": "P", "x": 10, "y": 0},
+                {"matrix": [0, 11], "label": "Backspace", "w": 1.75, "x": 11, "y": 0},
 
-                { "matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1 },
-                { "matrix": [1, 1], "label": "A", "x": 1.25, "y": 1 },
-                { "matrix": [1, 2], "label": "S", "x": 2.25, "y": 1 },
-                { "matrix": [1, 3], "label": "D", "x": 3.25, "y": 1 },
-                { "matrix": [1, 4], "label": "F", "x": 4.25, "y": 1 },
-                { "matrix": [1, 5], "label": "G", "x": 5.25, "y": 1 },
-                { "matrix": [1, 6], "label": "H", "x": 6.25, "y": 1 },
-                { "matrix": [1, 7], "label": "J", "x": 7.25, "y": 1 },
-                { "matrix": [1, 8], "label": "K", "x": 8.25, "y": 1 },
-                { "matrix": [1, 9], "label": "L", "x": 9.25, "y": 1 },
-                { "matrix": [1, 10], "label": ":", "x": 10.25, "y": 1 },
-                { "matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1 },
+                {"matrix": [1, 0], "label": "Tab", "w": 1.25, "x": 0, "y": 1},
+                {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "label": ":", "x": 10.25, "y": 1},
+                {"matrix": [1, 11], "label": "Enter", "w": 1.5, "x": 11.25, "y": 1},
 
-                { "matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2 },
-                { "matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2 },
-                { "matrix": [2, 2], "label": "X", "x": 2.75, "y": 2 },
-                { "matrix": [2, 3], "label": "C", "x": 3.75, "y": 2 },
-                { "matrix": [2, 4], "label": "V", "x": 4.75, "y": 2 },
-                { "matrix": [2, 5], "label": "B", "x": 5.75, "y": 2 },
-                { "matrix": [2, 6], "label": "N", "x": 6.75, "y": 2 },
-                { "matrix": [2, 7], "label": "M", "x": 7.75, "y": 2 },
-                { "matrix": [2, 8], "label": "<", "x": 8.75, "y": 2 },
-                { "matrix": [2, 9], "label": ">", "x": 9.75, "y": 2 },
-                { "matrix": [2, 10], "label": "?", "x": 10.75, "y": 2 },
-                { "matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2 },
-                { "matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2 },
+                {"matrix": [2, 0], "label": "Shift", "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "label": "<", "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "label": ">", "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "label": "?", "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "label": "\u2191", "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "label": "\u2191", "x": 12.75, "y": 2},
 
-                { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3 },
-                { "matrix": [3, 1], "label": "Win", "x": 1, "y": 3 },
-                { "matrix": [3, 2], "label": "Alt", "x": 2, "y": 3 },
-                { "matrix": [3, 5], "w":6.25, "x": 3, "y": 3 },
-                { "matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3 },
-                { "matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3 },
-                { "matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3 },
-                { "matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3 }
+                {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3},
+                {"matrix": [3, 1], "label": "Win", "x": 1, "y": 3},
+                {"matrix": [3, 2], "label": "Alt", "x": 2, "y": 3},
+                {"matrix": [3, 5], "w": 6.25, "x": 3, "y": 3},
+                {"matrix": [3, 8], "label": "Ctrl", "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "label": "\u2190", "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "label": "\u2193", "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "label": "\u2192", "x": 12.75, "y": 3}
             ]
         }
     }
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index fe8d6f9286..891c484778 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -21,52 +21,52 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":6, "y":0, "matrix": [0, 6]},
-                {"x":7, "y":0, "matrix": [0, 7]},
-                {"x":8, "y":0, "matrix": [0, 8]},
-                {"x":9, "y":0, "matrix": [0, 9]},
-                {"x":10, "y":0, "matrix": [0, 10]},
-                {"x":11, "y":0, "w":1.25, "matrix": [0, 11]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 6, "y": 0, "matrix": [0, 6]},
+                {"x": 7, "y": 0, "matrix": [0, 7]},
+                {"x": 8, "y": 0, "matrix": [0, 8]},
+                {"x": 9, "y": 0, "matrix": [0, 9]},
+                {"x": 10, "y": 0, "matrix": [0, 10]},
+                {"x": 11, "y": 0, "w": 1.25, "matrix": [0, 11]},
 
-                {"x":0, "y":1, "w":1.25, "matrix": [1, 0]},
-                {"x":1.25, "y":1, "matrix": [1, 1]},
-                {"x":2.25, "y":1, "matrix": [1, 2]},
-                {"x":3.25, "y":1, "matrix": [1, 3]},
-                {"x":4.25, "y":1, "matrix": [1, 4]},
-                {"x":5.25, "y":1, "matrix": [1, 5]},
-                {"x":6.25, "y":1, "matrix": [1, 6]},
-                {"x":7.25, "y":1, "matrix": [1, 7]},
-                {"x":8.25, "y":1, "matrix": [1, 8]},
-                {"x":9.25, "y":1, "matrix": [1, 9]},
-                {"x":10.25, "y":1, "matrix": [1, 10]},
-                {"x":11.25, "y":1, "matrix": [1, 11]},
+                {"x": 0, "y": 1, "w": 1.25, "matrix": [1, 0]},
+                {"x": 1.25, "y": 1, "matrix": [1, 1]},
+                {"x": 2.25, "y": 1, "matrix": [1, 2]},
+                {"x": 3.25, "y": 1, "matrix": [1, 3]},
+                {"x": 4.25, "y": 1, "matrix": [1, 4]},
+                {"x": 5.25, "y": 1, "matrix": [1, 5]},
+                {"x": 6.25, "y": 1, "matrix": [1, 6]},
+                {"x": 7.25, "y": 1, "matrix": [1, 7]},
+                {"x": 8.25, "y": 1, "matrix": [1, 8]},
+                {"x": 9.25, "y": 1, "matrix": [1, 9]},
+                {"x": 10.25, "y": 1, "matrix": [1, 10]},
+                {"x": 11.25, "y": 1, "matrix": [1, 11]},
 
-                {"x":0, "y":2, "w":1.75, "matrix": [2, 0]},
-                {"x":1.75, "y":2, "matrix": [2, 1]},
-                {"x":2.75, "y":2, "matrix": [2, 2]},
-                {"x":3.75, "y":2, "matrix": [2, 3]},
-                {"x":4.75, "y":2, "matrix": [2, 4]},
-                {"x":5.75, "y":2, "matrix": [2, 5]},
-                {"x":6.75, "y":2, "matrix": [2, 6]},
-                {"x":7.75, "y":2, "matrix": [2, 7]},
-                {"x":8.75, "y":2, "matrix": [2, 8]},
-                {"x":9.75, "y":2, "matrix": [2, 9]},
-                {"x":10.75, "y":2, "w":1.5, "matrix": [2, 11]},
+                {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+                {"x": 1.75, "y": 2, "matrix": [2, 1]},
+                {"x": 2.75, "y": 2, "matrix": [2, 2]},
+                {"x": 3.75, "y": 2, "matrix": [2, 3]},
+                {"x": 4.75, "y": 2, "matrix": [2, 4]},
+                {"x": 5.75, "y": 2, "matrix": [2, 5]},
+                {"x": 6.75, "y": 2, "matrix": [2, 6]},
+                {"x": 7.75, "y": 2, "matrix": [2, 7]},
+                {"x": 8.75, "y": 2, "matrix": [2, 8]},
+                {"x": 9.75, "y": 2, "matrix": [2, 9]},
+                {"x": 10.75, "y": 2, "w": 1.5, "matrix": [2, 11]},
 
-                {"x":0, "y":3, "w":1.25, "matrix": [3, 0]},
-                {"x":1.25, "y":3, "matrix": [3, 1]},
-                {"x":2.25, "y":3, "matrix": [3, 2]},
-                {"x":3.25, "y":3, "w":2.25, "matrix": [3, 3]},
-                {"x":5.5, "y":3, "w":2.75, "matrix": [3, 6]},
-                {"x":9, "y":3, "matrix": [3, 8]},
-                {"x":10, "y":3, "matrix": [3, 9]},
-                {"x":11, "y":3, "w":1.25, "matrix": [3, 11]}
+                {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+                {"x": 1.25, "y": 3, "matrix": [3, 1]},
+                {"x": 2.25, "y": 3, "matrix": [3, 2]},
+                {"x": 3.25, "y": 3, "w": 2.25, "matrix": [3, 3]},
+                {"x": 5.5, "y": 3, "w": 2.75, "matrix": [3, 6]},
+                {"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/ryanbaekr/rb1/info.json b/keyboards/ryanbaekr/rb1/info.json
index f610428f68..c3452d7596 100644
--- a/keyboards/ryanbaekr/rb1/info.json
+++ b/keyboards/ryanbaekr/rb1/info.json
@@ -18,7 +18,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0}
+                {"matrix": [0, 0], "x": 0, "y": 0}
             ]
         }
     }
diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/info.json
index 172c071d0a..019a23d5ea 100644
--- a/keyboards/saevus/cor/info.json
+++ b/keyboards/saevus/cor/info.json
@@ -26,83 +26,83 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x":0, "y":0 },
-                { "matrix": [0, 1], "x":1.25, "y":0 },
-                { "matrix": [0, 2], "x":2.25, "y":0 },
-                { "matrix": [0, 3], "x":3.25, "y":0 },
-                { "matrix": [0, 4], "x":4.25, "y":0 },
-                { "matrix": [0, 5], "x":5.25, "y":0 },
-                { "matrix": [0, 6], "x":6.25, "y":0 },
-                { "matrix": [0, 7], "x":7.25, "y":0 },
-                { "matrix": [0, 8], "x":8.25, "y":0 },
-                { "matrix": [0, 9], "x":9.25, "y":0 },
-                { "matrix": [0, 10], "x":10.25, "y":0 },
-                { "matrix": [0, 11], "x":11.25, "y":0 },
-                { "matrix": [0, 12], "x":12.25, "y":0 },
-                { "matrix": [0, 13], "x":13.25, "y":0 },
-                { "matrix": [0, 14], "x":14.25, "y":0 },
-                { "matrix": [0, 15], "x":15.25, "y":0 },
-                { "matrix": [0, 16], "x":16.75, "y":0 },
+                {"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.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.75, "y": 0},
 
-                { "matrix": [1, 0], "x":0, "y":1 },
-                { "matrix": [1, 1], "x":1.25, "y":1, "w":1.5 },
-                { "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], "x":11.75, "y":1 },
-                { "matrix": [1, 12], "x":12.75, "y":1 },
-                { "matrix": [1, 13], "x":13.75, "y":1 },
-                { "matrix": [1, 15], "x":14.75, "y":1, "w":1.5 },
-                { "matrix": [1, 16], "x":16.75, "y":1 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"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], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 16.75, "y": 1},
 
-                { "matrix": [2, 0], "x":0, "y":2 },
-                { "matrix": [2, 1], "x":1.25, "y":2, "w":1.75 },
-                { "matrix": [2, 2], "x":3, "y":2 },
-                { "matrix": [2, 3], "x":4, "y":2 },
-                { "matrix": [2, 4], "x":5, "y":2 },
-                { "matrix": [2, 5], "x":6, "y":2 },
-                { "matrix": [2, 6], "x":7, "y":2 },
-                { "matrix": [2, 7], "x":8, "y":2 },
-                { "matrix": [2, 8], "x":9, "y":2 },
-                { "matrix": [2, 9], "x":10, "y":2 },
-                { "matrix": [2, 10], "x":11, "y":2 },
-                { "matrix": [2, 11], "x":12, "y":2 },
-                { "matrix": [2, 12], "x":13, "y":2 },
-                { "matrix": [2, 14], "x":14, "y":2, "w":2.25 },
-                { "matrix": [2, 16], "x":16.75, "y":2 },
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3, "y": 2},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 14], "x": 14, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 16.75, "y": 2},
 
-                { "matrix": [3, 0], "x":0, "y":3 },
-                { "matrix": [3, 1], "x":1.25, "y":3, "w":2.25 },
-                { "matrix": [3, 3], "x":3.5, "y":3 },
-                { "matrix": [3, 4], "x":4.5, "y":3 },
-                { "matrix": [3, 5], "x":5.5, "y":3 },
-                { "matrix": [3, 6], "x":6.5, "y":3 },
-                { "matrix": [3, 7], "x":7.5, "y":3 },
-                { "matrix": [3, 8], "x":8.5, "y":3 },
-                { "matrix": [3, 9], "x":9.5, "y":3 },
-                { "matrix": [3, 10], "x":10.5, "y":3 },
-                { "matrix": [3, 11], "x":11.5, "y":3 },
-                { "matrix": [3, 12], "x":12.5, "y":3 },
-                { "matrix": [3, 13], "x":13.5, "y":3, "w":1.75 },
-                { "matrix": [3, 15], "x":15.5, "y":3.25 },
-                { "matrix": [3, 16], "x":16.75, "y":3 },
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 15.5, "y": 3.25},
+                {"matrix": [3, 16], "x": 16.75, "y": 3},
 
-                { "matrix": [4, 0], "x":0, "y":4 },
-                { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-                { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-                { "matrix": [4, 3], "x":3.75, "y":4, "w":1.25 },
-                { "matrix": [4, 7], "x":5, "y":4, "w":6.25 },
-                { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-                { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-                { "matrix": [4, 14], "x":14.5, "y":4.25 },
-                { "matrix": [4, 15], "x":15.5, "y":4.25 },
-                { "matrix": [4, 16], "x":16.5, "y":4.25 }
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 14], "x": 14.5, "y": 4.25},
+                {"matrix": [4, 15], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 16], "x": 16.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/salicylic_acid3/guide68/info.json b/keyboards/salicylic_acid3/guide68/info.json
index 8bb8511e99..09993a1138 100644
--- a/keyboards/salicylic_acid3/guide68/info.json
+++ b/keyboards/salicylic_acid3/guide68/info.json
@@ -56,74 +56,74 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1, "y":0},
-                {"matrix":[0, 2], "x":2, "y":0},
-                {"matrix":[0, 3], "x":3, "y":0},
-                {"matrix":[0, 4], "x":4, "y":0},
-                {"matrix":[0, 5], "x":5, "y":0},
-                {"matrix":[5, 0], "x":7, "y":0},
-                {"matrix":[5, 1], "x":8, "y":0},
-                {"matrix":[5, 2], "x":9, "y":0},
-                {"matrix":[5, 3], "x":10, "y":0},
-                {"matrix":[5, 4], "x":11, "y":0},
-                {"matrix":[5, 5], "x":12, "y":0},
-                {"matrix":[5, 6], "x":13, "y":0},
-                {"matrix":[5, 7], "x":14, "y":0},
-                {"matrix":[6, 7], "x":15, "y":0},
-                {"matrix":[1, 0], "x":0, "y":1, "w":1.5},
-                {"matrix":[1, 1], "x":1.5, "y":1},
-                {"matrix":[1, 2], "x":2.5, "y":1},
-                {"matrix":[1, 3], "x":3.5, "y":1},
-                {"matrix":[1, 4], "x":4.5, "y":1},
-                {"matrix":[1, 5], "x":5.5, "y":1},
-                {"matrix":[6, 0], "x":7.5, "y":1},
-                {"matrix":[6, 1], "x":8.5, "y":1},
-                {"matrix":[6, 2], "x":9.5, "y":1},
-                {"matrix":[6, 3], "x":10.5, "y":1},
-                {"matrix":[6, 4], "x":11.5, "y":1},
-                {"matrix":[6, 5], "x":12.5, "y":1},
-                {"matrix":[6, 6], "x":13.5, "y":1},
-                {"matrix":[7, 7], "x":14.5, "y":1, "w":1.5},
-                {"matrix":[2, 0], "x":0, "y":2, "w":1.75},
-                {"matrix":[2, 1], "x":1.75, "y":2},
-                {"matrix":[2, 2], "x":2.75, "y":2},
-                {"matrix":[2, 3], "x":3.75, "y":2},
-                {"matrix":[2, 4], "x":4.75, "y":2},
-                {"matrix":[2, 5], "x":5.75, "y":2},
-                {"matrix":[7, 0], "x":7.75, "y":2},
-                {"matrix":[7, 1], "x":8.75, "y":2},
-                {"matrix":[7, 2], "x":9.75, "y":2},
-                {"matrix":[7, 3], "x":10.75, "y":2},
-                {"matrix":[7, 4], "x":11.75, "y":2},
-                {"matrix":[7, 5], "x":12.75, "y":2},
-                {"matrix":[7, 6], "x":13.75, "y":2, "w":2.25},
-                {"matrix":[3, 0], "x":0, "y":3, "w":2},
-                {"matrix":[3, 1], "x":2, "y":3},
-                {"matrix":[3, 2], "x":3, "y":3},
-                {"matrix":[3, 3], "x":4, "y":3},
-                {"matrix":[3, 4], "x":5, "y":3},
-                {"matrix":[3, 5], "x":6, "y":3},
-                {"matrix":[8, 0], "x":8, "y":3},
-                {"matrix":[8, 1], "x":9, "y":3},
-                {"matrix":[8, 2], "x":10, "y":3},
-                {"matrix":[8, 3], "x":11, "y":3},
-                {"matrix":[8, 4], "x":12, "y":3},
-                {"matrix":[8, 5], "x":13, "y":3},
-                {"matrix":[8, 6], "x":14, "y":3},
-                {"matrix":[8, 7], "x":15, "y":3},
-                {"matrix":[4, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4, "w":1.25},
-                {"matrix":[4, 2], "x":2.5, "y":4, "w":1.25},
-                {"matrix":[4, 3], "x":3.75, "y":4, "w":1.5},
-                {"matrix":[4, 4], "x":5.25, "y":4, "w":1.5},
-                {"matrix":[9, 0], "x":7.75, "y":4, "w":1.5},
-                {"matrix":[9, 1], "x":9.25, "y":4, "w":1.25},
-                {"matrix":[9, 3], "x":10.5, "y":4, "w":1.25},
-                {"matrix":[9, 4], "x":11.75, "y":4, "w":1.25},
-                {"matrix":[9, 5], "x":13, "y":4},
-                {"matrix":[9, 6], "x":14, "y":4},
-                {"matrix":[9, 7], "x":15, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+                {"matrix": [5, 7], "x": 14, "y": 0},
+                {"matrix": [6, 7], "x": 15, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [6, 0], "x": 7.5, "y": 1},
+                {"matrix": [6, 1], "x": 8.5, "y": 1},
+                {"matrix": [6, 2], "x": 9.5, "y": 1},
+                {"matrix": [6, 3], "x": 10.5, "y": 1},
+                {"matrix": [6, 4], "x": 11.5, "y": 1},
+                {"matrix": [6, 5], "x": 12.5, "y": 1},
+                {"matrix": [6, 6], "x": 13.5, "y": 1},
+                {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [7, 0], "x": 7.75, "y": 2},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [8, 0], "x": 8, "y": 3},
+                {"matrix": [8, 1], "x": 9, "y": 3},
+                {"matrix": [8, 2], "x": 10, "y": 3},
+                {"matrix": [8, 3], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 5], "x": 13, "y": 3},
+                {"matrix": [8, 6], "x": 14, "y": 3},
+                {"matrix": [8, 7], "x": 15, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 9.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13, "y": 4},
+                {"matrix": [9, 6], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/sendyyeah/pix/info.json b/keyboards/sendyyeah/pix/info.json
index fda8bc8309..c1ca4137cc 100644
--- a/keyboards/sendyyeah/pix/info.json
+++ b/keyboards/sendyyeah/pix/info.json
@@ -26,11 +26,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]}
             ]
         }
     }
diff --git a/keyboards/sergiopoverony/creator_pro/info.json b/keyboards/sergiopoverony/creator_pro/info.json
index 9ac1a0a20c..4c9143ea07 100644
--- a/keyboards/sergiopoverony/creator_pro/info.json
+++ b/keyboards/sergiopoverony/creator_pro/info.json
@@ -23,15 +23,15 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":3, "y":0, "matrix": [0, 3]},
-        {"x":4.5, "y":0.5, "matrix": [0, 4]},
-        {"x":0, "y":1, "matrix": [0, 5]},
-        {"x":1, "y":1, "matrix": [0, 6]},
-        {"x":2, "y":1, "matrix": [0, 7]},
-        {"x":3, "y":1, "matrix": [0, 8]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 3, "y": 0, "matrix": [0, 3]},
+        {"x": 4.5, "y": 0.5, "matrix": [0, 4]},
+        {"x": 0, "y": 1, "matrix": [0, 5]},
+        {"x": 1, "y": 1, "matrix": [0, 6]},
+        {"x": 2, "y": 1, "matrix": [0, 7]},
+        {"x": 3, "y": 1, "matrix": [0, 8]}
       ]
     }
   }
diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json
index d973c34eba..7183ed66b2 100644
--- a/keyboards/splitish/info.json
+++ b/keyboards/splitish/info.json
@@ -18,57 +18,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":4, "y":0, "matrix": [0, 4]},
-                {"x":5, "y":0, "matrix": [0, 5]},
-                {"x":7, "y":0, "matrix": [0, 6]},
-                {"x":8, "y":0, "matrix": [0, 7]},
-                {"x":9, "y":0, "matrix": [0, 8]},
-                {"x":10, "y":0, "matrix": [0, 9]},
-                {"x":11, "y":0, "matrix": [0, 10]},
-                {"x":12, "y":0, "matrix": [0, 11]},
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 4, "y": 0, "matrix": [0, 4]},
+                {"x": 5, "y": 0, "matrix": [0, 5]},
+                {"x": 7, "y": 0, "matrix": [0, 6]},
+                {"x": 8, "y": 0, "matrix": [0, 7]},
+                {"x": 9, "y": 0, "matrix": [0, 8]},
+                {"x": 10, "y": 0, "matrix": [0, 9]},
+                {"x": 11, "y": 0, "matrix": [0, 10]},
+                {"x": 12, "y": 0, "matrix": [0, 11]},
 
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]},
-                {"x":4, "y":1, "matrix": [1, 4]},
-                {"x":5, "y":1, "matrix": [1, 5]},
-                {"x":7, "y":1, "matrix": [1, 6]},
-                {"x":8, "y":1, "matrix": [1, 7]},
-                {"x":9, "y":1, "matrix": [1, 8]},
-                {"x":10, "y":1, "matrix": [1, 9]},
-                {"x":11, "y":1, "matrix": [1, 10]},
-                {"x":12, "y":1, "matrix": [1, 11]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]},
+                {"x": 4, "y": 1, "matrix": [1, 4]},
+                {"x": 5, "y": 1, "matrix": [1, 5]},
+                {"x": 7, "y": 1, "matrix": [1, 6]},
+                {"x": 8, "y": 1, "matrix": [1, 7]},
+                {"x": 9, "y": 1, "matrix": [1, 8]},
+                {"x": 10, "y": 1, "matrix": [1, 9]},
+                {"x": 11, "y": 1, "matrix": [1, 10]},
+                {"x": 12, "y": 1, "matrix": [1, 11]},
 
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":3, "y":2, "matrix": [2, 3]},
-                {"x":4, "y":2, "matrix": [2, 4]},
-                {"x":5, "y":2, "matrix": [2, 5]},
-                {"x":7, "y":2, "matrix": [2, 6]},
-                {"x":8, "y":2, "matrix": [2, 7]},
-                {"x":9, "y":2, "matrix": [2, 8]},
-                {"x":10, "y":2, "matrix": [2, 9]},
-                {"x":11, "y":2, "matrix": [2, 10]},
-                {"x":12, "y":2, "matrix": [2, 11]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2, "matrix": [2, 3]},
+                {"x": 4, "y": 2, "matrix": [2, 4]},
+                {"x": 5, "y": 2, "matrix": [2, 5]},
+                {"x": 7, "y": 2, "matrix": [2, 6]},
+                {"x": 8, "y": 2, "matrix": [2, 7]},
+                {"x": 9, "y": 2, "matrix": [2, 8]},
+                {"x": 10, "y": 2, "matrix": [2, 9]},
+                {"x": 11, "y": 2, "matrix": [2, 10]},
+                {"x": 12, "y": 2, "matrix": [2, 11]},
 
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]},
-                {"x":3, "y":3, "matrix": [3, 3]},
-                {"x":4, "y":3, "matrix": [3, 4]},
-                {"x":5, "y":3, "matrix": [3, 5]},
-                {"x":7, "y":3, "matrix": [3, 6]},
-                {"x":8, "y":3, "matrix": [3, 7]},
-                {"x":9, "y":3, "matrix": [3, 8]},
-                {"x":10, "y":3, "matrix": [3, 9]},
-                {"x":11, "y":3, "matrix": [3, 10]},
-                {"x":12, "y":3, "matrix": [3, 11]}
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]},
+                {"x": 3, "y": 3, "matrix": [3, 3]},
+                {"x": 4, "y": 3, "matrix": [3, 4]},
+                {"x": 5, "y": 3, "matrix": [3, 5]},
+                {"x": 7, "y": 3, "matrix": [3, 6]},
+                {"x": 8, "y": 3, "matrix": [3, 7]},
+                {"x": 9, "y": 3, "matrix": [3, 8]},
+                {"x": 10, "y": 3, "matrix": [3, 9]},
+                {"x": 11, "y": 3, "matrix": [3, 10]},
+                {"x": 12, "y": 3, "matrix": [3, 11]}
             ]
         }
     }
diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json
index 7fd39cf607..6cb53f372f 100644
--- a/keyboards/splitkb/zima/info.json
+++ b/keyboards/splitkb/zima/info.json
@@ -29,18 +29,18 @@
     "layouts": {
         "LAYOUT_ortho_4x3": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]},
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":2, "y":3, "matrix": [3, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 2, "y": 3, "matrix": [3, 2]}
             ]
         }
     }
diff --git a/keyboards/studiokestra/frl84/info.json b/keyboards/studiokestra/frl84/info.json
index f0803ededc..6dff424b0e 100644
--- a/keyboards/studiokestra/frl84/info.json
+++ b/keyboards/studiokestra/frl84/info.json
@@ -30,91 +30,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "matrix": [0, 0], "x":0, "y":0},
-                {"label":"1", "matrix": [1, 0], "x":1, "y":0},
-                {"label":"2", "matrix": [0, 1], "x":2, "y":0},
-                {"label":"3", "matrix": [1, 1], "x":3, "y":0},
-                {"label":"4", "matrix": [0, 2], "x":4, "y":0},
-                {"label":"5", "matrix": [1, 2], "x":5, "y":0},
-                {"label":"6", "matrix": [0, 3], "x":6, "y":0},
-                {"label":"7", "matrix": [1, 3], "x":7, "y":0},
-                {"label":"8", "matrix": [0, 4], "x":8, "y":0},
-                {"label":"9", "matrix": [1, 4], "x":9, "y":0},
-                {"label":"0", "matrix": [0, 5], "x":10, "y":0},
-                {"label":"_", "matrix": [1, 5], "x":11, "y":0},
-                {"label":"+", "matrix": [0, 6], "x":12, "y":0},
-                {"label":"|", "matrix": [1, 6], "x":13, "y":0},
-                {"label":"~", "matrix": [0, 7], "x":14, "y":0},
-                {"label":"Num Lock", "matrix": [1, 7], "x":15, "y":0},
-                {"label":"/", "matrix": [0, 8], "x":16, "y":0},
-                {"label":"*", "matrix": [1, 8], "x":17, "y":0},
-                {"label":"-", "matrix": [3, 8], "x":18, "y":0},
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "_", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "+", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "|", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "~", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Num Lock", "matrix": [1, 7], "x": 15, "y": 0},
+                {"label": "/", "matrix": [0, 8], "x": 16, "y": 0},
+                {"label": "*", "matrix": [1, 8], "x": 17, "y": 0},
+                {"label": "-", "matrix": [3, 8], "x": 18, "y": 0},
 
-                {"label":"Tab", "matrix": [2, 0], "x":0, "y":1, "w":1.5},
-                {"label":"Q", "matrix": [3, 0], "x":1.5, "y":1},
-                {"label":"W", "matrix": [2, 1], "x":2.5, "y":1},
-                {"label":"E", "matrix": [3, 1], "x":3.5, "y":1},
-                {"label":"R", "matrix": [2, 2], "x":4.5, "y":1},
-                {"label":"T", "matrix": [3, 2], "x":5.5, "y":1},
-                {"label":"Y", "matrix": [2, 3], "x":6.5, "y":1},
-                {"label":"U", "matrix": [3, 3], "x":7.5, "y":1},
-                {"label":"I", "matrix": [2, 4], "x":8.5, "y":1},
-                {"label":"O", "matrix": [3, 4], "x":9.5, "y":1},
-                {"label":"P", "matrix": [2, 5], "x":10.5, "y":1},
-                {"label":"{", "matrix": [3, 5], "x":11.5, "y":1},
-                {"label":"}", "matrix": [2, 6], "x":12.5, "y":1},
-                {"label":"Backspace", "matrix": [3, 6], "x":13.5, "y":1, "w":1.5},
-                {"label":"7", "matrix": [2, 7], "x":15, "y":1},
-                {"label":"8", "matrix": [3, 7], "x":16, "y":1},
-                {"label":"9", "matrix": [2, 8], "x":17, "y":1},
-                {"label":"+", "matrix": [5, 8], "x":18, "y":1, "h":2},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "{", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "}", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "Backspace", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "7", "matrix": [2, 7], "x": 15, "y": 1},
+                {"label": "8", "matrix": [3, 7], "x": 16, "y": 1},
+                {"label": "9", "matrix": [2, 8], "x": 17, "y": 1},
+                {"label": "+", "matrix": [5, 8], "x": 18, "y": 1, "h": 2},
 
-                {"label":"Caps Lock", "matrix": [4, 0], "x":0, "y":2, "w":1.75},
-                {"label":"A", "matrix": [5, 0], "x":1.75, "y":2},
-                {"label":"S", "matrix": [4, 1], "x":2.75, "y":2},
-                {"label":"D", "matrix": [5, 1], "x":3.75, "y":2},
-                {"label":"F", "matrix": [4, 2], "x":4.75, "y":2},
-                {"label":"G", "matrix": [5, 2], "x":5.75, "y":2},
-                {"label":"H", "matrix": [4, 3], "x":6.75, "y":2},
-                {"label":"J", "matrix": [5, 3], "x":7.75, "y":2},
-                {"label":"K", "matrix": [4, 4], "x":8.75, "y":2},
-                {"label":"L", "matrix": [5, 4], "x":9.75, "y":2},
-                {"label":":", "matrix": [4, 5], "x":10.75, "y":2},
-                {"label":"\"", "matrix": [5, 5], "x":11.75, "y":2},
-                {"label":"Enter", "matrix": [4, 6], "x":12.75, "y":2, "w":2.25},
-                {"label":"4", "matrix": [4, 7], "x":15, "y":2},
-                {"label":"5", "matrix": [5, 7], "x":16, "y":2},
-                {"label":"6", "matrix": [4, 8], "x":17, "y":2},
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ":", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "\"", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "4", "matrix": [4, 7], "x": 15, "y": 2},
+                {"label": "5", "matrix": [5, 7], "x": 16, "y": 2},
+                {"label": "6", "matrix": [4, 8], "x": 17, "y": 2},
 
-                {"label":"Shift", "matrix": [6, 0], "x":0, "y":3, "w":2.25},
-                {"label":"Z", "matrix": [7, 0], "x":2.25, "y":3},
-                {"label":"X", "matrix": [6, 1], "x":3.25, "y":3},
-                {"label":"C", "matrix": [7, 1], "x":4.25, "y":3},
-                {"label":"V", "matrix": [6, 2], "x":5.25, "y":3},
-                {"label":"B", "matrix": [7, 2], "x":6.25, "y":3},
-                {"label":"N", "matrix": [6, 3], "x":7.25, "y":3},
-                {"label":"M", "matrix": [7, 3], "x":8.25, "y":3},
-                {"label":"<", "matrix": [6, 4], "x":9.25, "y":3},
-                {"label":">", "matrix": [7, 4], "x":10.25, "y":3},
-                {"label":"?", "matrix": [6, 5], "x":11.25, "y":3},
-                {"label":"Shift", "matrix": [7, 5], "x":12.25, "y":3, "w":1.75},
-                {"label":"\u2191", "matrix": [6, 6], "x":14, "y":3},
-                {"label":"1", "matrix": [6, 7], "x":15, "y":3},
-                {"label":"2", "matrix": [7, 7], "x":16, "y":3},
-                {"label":"3", "matrix": [6, 8], "x":17, "y":3},
-                {"label":"Enter", "matrix": [7, 8], "x":18, "y":3, "h":2},
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [7, 0], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [6, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [7, 1], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [6, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [7, 2], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [6, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [7, 3], "x": 8.25, "y": 3},
+                {"label": "<", "matrix": [6, 4], "x": 9.25, "y": 3},
+                {"label": ">", "matrix": [7, 4], "x": 10.25, "y": 3},
+                {"label": "?", "matrix": [6, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [6, 6], "x": 14, "y": 3},
+                {"label": "1", "matrix": [6, 7], "x": 15, "y": 3},
+                {"label": "2", "matrix": [7, 7], "x": 16, "y": 3},
+                {"label": "3", "matrix": [6, 8], "x": 17, "y": 3},
+                {"label": "Enter", "matrix": [7, 8], "x": 18, "y": 3, "h": 2},
 
-                {"label":"Ctrl", "matrix": [8, 0], "x":0, "y":4, "w":1.25},
-                {"label":"Win", "matrix": [9, 0], "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "matrix": [8, 1], "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "matrix": [8, 3], "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "matrix": [8, 4], "x":10, "y":4, "w":1.25},
-                {"label":"Ctrl", "matrix": [8, 5], "x":11.25, "y":4, "w":1.25},
-                {"label":"\u2190", "matrix": [8, 6], "x":13, "y":4},
-                {"label":"\u2193", "matrix": [9, 6], "x":14, "y":4},
-                {"label":"\u2192", "matrix": [8, 7], "x":15, "y":4},
-                {"label":"0", "matrix": [9, 7], "x":16, "y":4},
-                {"label":".", "matrix": [8, 8], "x":17, "y":4}
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "Win", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [8, 7], "x": 15, "y": 4},
+                {"label": "0", "matrix": [9, 7], "x": 16, "y": 4},
+                {"label": ".", "matrix": [8, 8], "x": 17, "y": 4}
             ]
         }
     }
diff --git a/keyboards/synthlabs/060/info.json b/keyboards/synthlabs/060/info.json
index 5fe9addd24..1953af10e7 100644
--- a/keyboards/synthlabs/060/info.json
+++ b/keyboards/synthlabs/060/info.json
@@ -32,73 +32,73 @@
   "rgb_matrix": {
     "driver": "WS2812",
     "layout": [
-        { "flags": 1, "matrix": [0, 0], "x": 0, "y": 0 },
-        { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 },
-        { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 },
-        { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 },
-        { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 },
-        { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 },
-        { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 },
-        { "flags": 4, "matrix": [0, 7], "x":112, "y": 0 },
-        { "flags": 4, "matrix": [0, 8], "x":128, "y": 0 },
-        { "flags": 4, "matrix": [0, 9], "x":144, "y": 0 },
-        { "flags": 4, "matrix": [0, 10], "x":160, "y": 0 },
-        { "flags": 4, "matrix": [0, 11], "x":176, "y": 0 },
-        { "flags": 4, "matrix": [0, 12], "x":192, "y": 0 },
-        { "flags": 1, "matrix": [0, 13], "x":216, "y": 0 },
-
-        { "flags": 1, "matrix": [2, 12], "x":220, "y":16 },
-        { "flags": 4, "matrix": [1, 12], "x":200, "y":16 },
-        { "flags": 4, "matrix": [1, 11], "x":184, "y":16 },
-        { "flags": 4, "matrix": [1, 10], "x":168, "y":16 },
-        { "flags": 4, "matrix": [1, 9], "x":152, "y":16 },
-        { "flags": 4, "matrix": [1, 8], "x":136, "y":16 },
-        { "flags": 4, "matrix": [1, 7], "x":120, "y":16 },
-        { "flags": 4, "matrix": [1, 6], "x":104, "y":16 },
-        { "flags": 4, "matrix": [1, 5], "x": 88, "y":16 },
-        { "flags": 4, "matrix": [1, 4], "x": 72, "y":16 },
-        { "flags": 4, "matrix": [1, 3], "x": 56, "y":16 },
-        { "flags": 4, "matrix": [1, 2], "x": 40, "y":16 },
-        { "flags": 4, "matrix": [1, 1], "x": 24, "y":16 },
-        { "flags": 1, "matrix": [1, 0], "x": 4, "y":16 },
-
-        { "flags": 1, "matrix": [2, 0], "x": 6, "y":32 },
-        { "flags": 4, "matrix": [2, 1], "x": 28, "y":32 },
-        { "flags": 4, "matrix": [2, 2], "x": 44, "y":32 },
-        { "flags": 4, "matrix": [2, 3], "x": 60, "y":32 },
-        { "flags": 4, "matrix": [2, 4], "x": 76, "y":32 },
-        { "flags": 4, "matrix": [2, 5], "x": 92, "y":32 },
-        { "flags": 4, "matrix": [2, 6], "x":108, "y":32 },
-        { "flags": 4, "matrix": [2, 7], "x":124, "y":32 },
-        { "flags": 4, "matrix": [2, 8], "x":140, "y":32 },
-        { "flags": 4, "matrix": [2, 9], "x":156, "y":32 },
-        { "flags": 4, "matrix": [2, 10], "x":172, "y":32 },
-        { "flags": 4, "matrix": [2, 11], "x":188, "y":32 },
-        { "flags": 1, "matrix": [2, 13], "x":214, "y":32 },
-
-        { "flags": 1, "matrix": [3, 13], "x":224, "y":48 },
-        { "flags": 1, "matrix": [3, 12], "x":202, "y":48 },
-        { "flags": 4, "matrix": [3, 11], "x":180, "y":48 },
-        { "flags": 4, "matrix": [3, 10], "x":164, "y":48 },
-        { "flags": 4, "matrix": [3, 9], "x":148, "y":48 },
-        { "flags": 4, "matrix": [3, 8], "x":132, "y":48 },
-        { "flags": 4, "matrix": [3, 7], "x":116, "y":48 },
-        { "flags": 4, "matrix": [3, 6], "x":100, "y":48 },
-        { "flags": 4, "matrix": [3, 5], "x": 84, "y":48 },
-        { "flags": 4, "matrix": [3, 4], "x": 68, "y":48 },
-        { "flags": 4, "matrix": [3, 3], "x": 52, "y":48 },
-        { "flags": 4, "matrix": [3, 2], "x": 36, "y":48 },
-        { "flags": 1, "matrix": [3, 0], "x": 10, "y":48 },
-
-        { "flags": 1, "matrix": [4, 0], "x": 4, "y":64 },
-        { "flags": 1, "matrix": [4, 1], "x": 24, "y":64 },
-        { "flags": 1, "matrix": [4, 2], "x": 44, "y":64 },
-        { "flags": 4, "matrix": [4, 5], "x": 78, "y":64 },
-        { "flags": 4, "matrix": [4, 7], "x":112, "y":64 },
-        { "flags": 4, "matrix": [4, 9], "x":146, "y":64 },
-        { "flags": 1, "matrix": [4, 11], "x":180, "y":64 },
-        { "flags": 1, "matrix": [4, 12], "x":200, "y":64 },
-        { "flags": 1, "matrix": [4, 13], "x":220, "y":64 }
+        {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
+        {"flags": 4, "matrix": [0, 1], "x": 16, "y": 0},
+        {"flags": 4, "matrix": [0, 2], "x": 32, "y": 0},
+        {"flags": 4, "matrix": [0, 3], "x": 48, "y": 0},
+        {"flags": 4, "matrix": [0, 4], "x": 64, "y": 0},
+        {"flags": 4, "matrix": [0, 5], "x": 80, "y": 0},
+        {"flags": 4, "matrix": [0, 6], "x": 96, "y": 0},
+        {"flags": 4, "matrix": [0, 7], "x": 112, "y": 0},
+        {"flags": 4, "matrix": [0, 8], "x": 128, "y": 0},
+        {"flags": 4, "matrix": [0, 9], "x": 144, "y": 0},
+        {"flags": 4, "matrix": [0, 10], "x": 160, "y": 0},
+        {"flags": 4, "matrix": [0, 11], "x": 176, "y": 0},
+        {"flags": 4, "matrix": [0, 12], "x": 192, "y": 0},
+        {"flags": 1, "matrix": [0, 13], "x": 216, "y": 0},
+
+        {"flags": 1, "matrix": [2, 12], "x": 220, "y": 16},
+        {"flags": 4, "matrix": [1, 12], "x": 200, "y": 16},
+        {"flags": 4, "matrix": [1, 11], "x": 184, "y": 16},
+        {"flags": 4, "matrix": [1, 10], "x": 168, "y": 16},
+        {"flags": 4, "matrix": [1, 9], "x": 152, "y": 16},
+        {"flags": 4, "matrix": [1, 8], "x": 136, "y": 16},
+        {"flags": 4, "matrix": [1, 7], "x": 120, "y": 16},
+        {"flags": 4, "matrix": [1, 6], "x": 104, "y": 16},
+        {"flags": 4, "matrix": [1, 5], "x": 88, "y": 16},
+        {"flags": 4, "matrix": [1, 4], "x": 72, "y": 16},
+        {"flags": 4, "matrix": [1, 3], "x": 56, "y": 16},
+        {"flags": 4, "matrix": [1, 2], "x": 40, "y": 16},
+        {"flags": 4, "matrix": [1, 1], "x": 24, "y": 16},
+        {"flags": 1, "matrix": [1, 0], "x": 4, "y": 16},
+
+        {"flags": 1, "matrix": [2, 0], "x": 6, "y": 32},
+        {"flags": 4, "matrix": [2, 1], "x": 28, "y": 32},
+        {"flags": 4, "matrix": [2, 2], "x": 44, "y": 32},
+        {"flags": 4, "matrix": [2, 3], "x": 60, "y": 32},
+        {"flags": 4, "matrix": [2, 4], "x": 76, "y": 32},
+        {"flags": 4, "matrix": [2, 5], "x": 92, "y": 32},
+        {"flags": 4, "matrix": [2, 6], "x": 108, "y": 32},
+        {"flags": 4, "matrix": [2, 7], "x": 124, "y": 32},
+        {"flags": 4, "matrix": [2, 8], "x": 140, "y": 32},
+        {"flags": 4, "matrix": [2, 9], "x": 156, "y": 32},
+        {"flags": 4, "matrix": [2, 10], "x": 172, "y": 32},
+        {"flags": 4, "matrix": [2, 11], "x": 188, "y": 32},
+        {"flags": 1, "matrix": [2, 13], "x": 214, "y": 32},
+
+        {"flags": 1, "matrix": [3, 13], "x": 224, "y": 48},
+        {"flags": 1, "matrix": [3, 12], "x": 202, "y": 48},
+        {"flags": 4, "matrix": [3, 11], "x": 180, "y": 48},
+        {"flags": 4, "matrix": [3, 10], "x": 164, "y": 48},
+        {"flags": 4, "matrix": [3, 9], "x": 148, "y": 48},
+        {"flags": 4, "matrix": [3, 8], "x": 132, "y": 48},
+        {"flags": 4, "matrix": [3, 7], "x": 116, "y": 48},
+        {"flags": 4, "matrix": [3, 6], "x": 100, "y": 48},
+        {"flags": 4, "matrix": [3, 5], "x": 84, "y": 48},
+        {"flags": 4, "matrix": [3, 4], "x": 68, "y": 48},
+        {"flags": 4, "matrix": [3, 3], "x": 52, "y": 48},
+        {"flags": 4, "matrix": [3, 2], "x": 36, "y": 48},
+        {"flags": 1, "matrix": [3, 0], "x": 10, "y": 48},
+
+        {"flags": 1, "matrix": [4, 0], "x": 4, "y": 64},
+        {"flags": 1, "matrix": [4, 1], "x": 24, "y": 64},
+        {"flags": 1, "matrix": [4, 2], "x": 44, "y": 64},
+        {"flags": 4, "matrix": [4, 5], "x": 78, "y": 64},
+        {"flags": 4, "matrix": [4, 7], "x": 112, "y": 64},
+        {"flags": 4, "matrix": [4, 9], "x": 146, "y": 64},
+        {"flags": 1, "matrix": [4, 11], "x": 180, "y": 64},
+        {"flags": 1, "matrix": [4, 12], "x": 200, "y": 64},
+        {"flags": 1, "matrix": [4, 13], "x": 220, "y": 64}
     ]
   },
   "community_layouts": [
@@ -113,565 +113,565 @@
   "layouts": {
     "LAYOUT_all": {
         "layout": [
-          { "matrix": [0, 0], "x":0, "y":0 },
-          { "matrix": [0, 1], "x":1, "y":0 },
-          { "matrix": [0, 2], "x":2, "y":0 },
-          { "matrix": [0, 3], "x":3, "y":0 },
-          { "matrix": [0, 4], "x":4, "y":0 },
-          { "matrix": [0, 5], "x":5, "y":0 },
-          { "matrix": [0, 6], "x":6, "y":0 },
-          { "matrix": [0, 7], "x":7, "y":0 },
-          { "matrix": [0, 8], "x":8, "y":0 },
-          { "matrix": [0, 9], "x":9, "y":0 },
-          { "matrix": [0, 10], "x":10, "y":0 },
-          { "matrix": [0, 11], "x":11, "y":0 },
-          { "matrix": [0, 12], "x":12, "y":0 },
-          { "matrix": [0, 13], "x":13, "y":0 },
-          { "matrix": [1, 13], "x":14, "y":0 },
-
-          { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-          { "matrix": [1, 1], "x":1.5, "y":1 },
-          { "matrix": [1, 2], "x":2.5, "y":1 },
-          { "matrix": [1, 3], "x":3.5, "y":1 },
-          { "matrix": [1, 4], "x":4.5, "y":1 },
-          { "matrix": [1, 5], "x":5.5, "y":1 },
-          { "matrix": [1, 6], "x":6.5, "y":1 },
-          { "matrix": [1, 7], "x":7.5, "y":1 },
-          { "matrix": [1, 8], "x":8.5, "y":1 },
-          { "matrix": [1, 9], "x":9.5, "y":1 },
-          { "matrix": [1, 10], "x":10.5, "y":1 },
-          { "matrix": [1, 11], "x":11.5, "y":1 },
-          { "matrix": [1, 12], "x":12.5, "y":1 },
-          { "matrix": [2, 12], "x":13.5, "y":1, "w":1.5 },
-
-          { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-          { "matrix": [2, 1], "x":1.75, "y":2 },
-          { "matrix": [2, 2], "x":2.75, "y":2 },
-          { "matrix": [2, 3], "x":3.75, "y":2 },
-          { "matrix": [2, 4], "x":4.75, "y":2 },
-          { "matrix": [2, 5], "x":5.75, "y":2 },
-          { "matrix": [2, 6], "x":6.75, "y":2 },
-          { "matrix": [2, 7], "x":7.75, "y":2 },
-          { "matrix": [2, 8], "x":8.75, "y":2 },
-          { "matrix": [2, 9], "x":9.75, "y":2 },
-          { "matrix": [2, 10], "x":10.75, "y":2 },
-          { "matrix": [2, 11], "x":11.75, "y":2 },
-          { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-
-          { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-          { "matrix": [3, 1], "x":1.25, "y":3 },
-          { "matrix": [3, 2], "x":2.25, "y":3 },
-          { "matrix": [3, 3], "x":3.25, "y":3 },
-          { "matrix": [3, 4], "x":4.25, "y":3 },
-          { "matrix": [3, 5], "x":5.25, "y":3 },
-          { "matrix": [3, 6], "x":6.25, "y":3 },
-          { "matrix": [3, 7], "x":7.25, "y":3 },
-          { "matrix": [3, 8], "x":8.25, "y":3 },
-          { "matrix": [3, 9], "x":9.25, "y":3 },
-          { "matrix": [3, 10], "x":10.25, "y":3 },
-          { "matrix": [3, 11], "x":11.25, "y":3 },
-          { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-          { "matrix": [3, 13], "x":14, "y":3 },
-
-          { "matrix": [4, 0], "x":0, "y":4, "w":1.5 },
-          { "matrix": [4, 1], "x":1.5, "y":4 },
-          { "matrix": [4, 2], "x":2.5, "y":4, "w":1.5 },
-          { "matrix": [4, 5], "x":4, "y":4, "w":2.75 },
-          { "matrix": [4, 7], "x":6.75, "y":4 },
-          { "matrix": [4, 9], "x":7.75, "y":4, "w":2.25 },
-          { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-          { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-          { "matrix": [4, 12], "x":12.5, "y":4 },
-          { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 }
+          {"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": [1, 13], "x": 14, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+          {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+          {"matrix": [2, 1], "x": 1.75, "y": 2},
+          {"matrix": [2, 2], "x": 2.75, "y": 2},
+          {"matrix": [2, 3], "x": 3.75, "y": 2},
+          {"matrix": [2, 4], "x": 4.75, "y": 2},
+          {"matrix": [2, 5], "x": 5.75, "y": 2},
+          {"matrix": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 13], "x": 14, "y": 3},
+
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+          {"matrix": [4, 1], "x": 1.5, "y": 4},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+          {"matrix": [4, 5], "x": 4, "y": 4, "w": 2.75},
+          {"matrix": [4, 7], "x": 6.75, "y": 4},
+          {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 2.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 12.5, "y": 4},
+          {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
         ]
     },
     "LAYOUT_60_ansi": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-        { "matrix": [2, 12], "x":13.5, "y":1, "w":1.5 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-        { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-        { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-        { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-        { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-        { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-        { "matrix": [4, 13], "x":13.75, "y":4, "w":1.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": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
       ]
     },
     "LAYOUT_60_ansi_split_bs_rshift": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0 },
-        { "matrix": [1, 13], "x":14, "y":0 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-        { "matrix": [2, 12], "x":13.5, "y":1, "w":1.5 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-        { "matrix": [3, 13], "x":14, "y":3 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-        { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-        { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-        { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-        { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-        { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-        { "matrix": [4, 13], "x":13.75, "y":4, "w":1.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": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [1, 13], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
       ]
     },
     "LAYOUT_60_ansi_tsangan": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-        { "matrix": [2, 12], "x":13.5, "y":1, "w":1.5 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.5 },
-        { "matrix": [4, 1], "x":1.5, "y":4 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.5 },
-        { "matrix": [4, 7], "x":4, "y":4, "w":7 },
-        { "matrix": [4, 11], "x":11, "y":4, "w":1.5 },
-        { "matrix": [4, 12], "x":12.5, "y":4 },
-        { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 12.5, "y": 4},
+        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_60_tsangan_hhkb": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0 },
-        { "matrix": [1, 13], "x":14, "y":0 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-        { "matrix": [2, 12], "x":13.5, "y":1, "w":1.5 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":2.25 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-        { "matrix": [3, 13], "x":14, "y":3 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.5 },
-        { "matrix": [4, 1], "x":1.5, "y":4 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.5 },
-        { "matrix": [4, 7], "x":4, "y":4, "w":7 },
-        { "matrix": [4, 11], "x":11, "y":4, "w":1.5 },
-        { "matrix": [4, 12], "x":12.5, "y":4 },
-        { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 }
+        {"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": [1, 13], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+        {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 12.5, "y": 4},
+        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
       ]
     },
     "LAYOUT_60_iso": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 12], "x":12.75, "y":2 },
-        { "matrix": [2, 13], "x":13.75, "y":1, "w":1.25, "h":2 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-        { "matrix": [3, 1], "x":1.25, "y":3 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-        { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-        { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-        { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-        { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-        { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-        { "matrix": [4, 13], "x":13.75, "y":4, "w":1.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": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
       ]
     },
     "LAYOUT_60_iso_split_bs_rshift": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0 },
-        { "matrix": [1, 13], "x":14, "y":0 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 12], "x":12.75, "y":2 },
-        { "matrix": [2, 13], "x":13.75, "y":1, "w":1.25, "h":2 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-        { "matrix": [3, 1], "x":1.25, "y":3 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 },
-        { "matrix": [3, 13], "x":14, "y":3 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.25 },
-        { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 },
-        { "matrix": [4, 7], "x":3.75, "y":4, "w":6.25 },
-        { "matrix": [4, 10], "x":10, "y":4, "w":1.25 },
-        { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 },
-        { "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 },
-        { "matrix": [4, 13], "x":13.75, "y":4, "w":1.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": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0},
+        {"matrix": [1, 13], "x": 14, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 14, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
       ]
     },
     "LAYOUT_60_iso_tsangan": {
       "layout": [
-        { "matrix": [0, 0], "x":0, "y":0 },
-        { "matrix": [0, 1], "x":1, "y":0 },
-        { "matrix": [0, 2], "x":2, "y":0 },
-        { "matrix": [0, 3], "x":3, "y":0 },
-        { "matrix": [0, 4], "x":4, "y":0 },
-        { "matrix": [0, 5], "x":5, "y":0 },
-        { "matrix": [0, 6], "x":6, "y":0 },
-        { "matrix": [0, 7], "x":7, "y":0 },
-        { "matrix": [0, 8], "x":8, "y":0 },
-        { "matrix": [0, 9], "x":9, "y":0 },
-        { "matrix": [0, 10], "x":10, "y":0 },
-        { "matrix": [0, 11], "x":11, "y":0 },
-        { "matrix": [0, 12], "x":12, "y":0 },
-        { "matrix": [0, 13], "x":13, "y":0, "w":2 },
-
-        { "matrix": [1, 0], "x":0, "y":1, "w":1.5 },
-        { "matrix": [1, 1], "x":1.5, "y":1 },
-        { "matrix": [1, 2], "x":2.5, "y":1 },
-        { "matrix": [1, 3], "x":3.5, "y":1 },
-        { "matrix": [1, 4], "x":4.5, "y":1 },
-        { "matrix": [1, 5], "x":5.5, "y":1 },
-        { "matrix": [1, 6], "x":6.5, "y":1 },
-        { "matrix": [1, 7], "x":7.5, "y":1 },
-        { "matrix": [1, 8], "x":8.5, "y":1 },
-        { "matrix": [1, 9], "x":9.5, "y":1 },
-        { "matrix": [1, 10], "x":10.5, "y":1 },
-        { "matrix": [1, 11], "x":11.5, "y":1 },
-        { "matrix": [1, 12], "x":12.5, "y":1 },
-
-        { "matrix": [2, 0], "x":0, "y":2, "w":1.75 },
-        { "matrix": [2, 1], "x":1.75, "y":2 },
-        { "matrix": [2, 2], "x":2.75, "y":2 },
-        { "matrix": [2, 3], "x":3.75, "y":2 },
-        { "matrix": [2, 4], "x":4.75, "y":2 },
-        { "matrix": [2, 5], "x":5.75, "y":2 },
-        { "matrix": [2, 6], "x":6.75, "y":2 },
-        { "matrix": [2, 7], "x":7.75, "y":2 },
-        { "matrix": [2, 8], "x":8.75, "y":2 },
-        { "matrix": [2, 9], "x":9.75, "y":2 },
-        { "matrix": [2, 10], "x":10.75, "y":2 },
-        { "matrix": [2, 11], "x":11.75, "y":2 },
-        { "matrix": [2, 12], "x":12.75, "y":2 },
-        { "matrix": [2, 13], "x":13.75, "y":1, "w":1.25, "h":2 },
-
-        { "matrix": [3, 0], "x":0, "y":3, "w":1.25 },
-        { "matrix": [3, 1], "x":1.25, "y":3 },
-        { "matrix": [3, 2], "x":2.25, "y":3 },
-        { "matrix": [3, 3], "x":3.25, "y":3 },
-        { "matrix": [3, 4], "x":4.25, "y":3 },
-        { "matrix": [3, 5], "x":5.25, "y":3 },
-        { "matrix": [3, 6], "x":6.25, "y":3 },
-        { "matrix": [3, 7], "x":7.25, "y":3 },
-        { "matrix": [3, 8], "x":8.25, "y":3 },
-        { "matrix": [3, 9], "x":9.25, "y":3 },
-        { "matrix": [3, 10], "x":10.25, "y":3 },
-        { "matrix": [3, 11], "x":11.25, "y":3 },
-        { "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 },
-
-        { "matrix": [4, 0], "x":0, "y":4, "w":1.5 },
-        { "matrix": [4, 1], "x":1.5, "y":4 },
-        { "matrix": [4, 2], "x":2.5, "y":4, "w":1.5 },
-        { "matrix": [4, 7], "x":4, "y":4, "w":7 },
-        { "matrix": [4, 11], "x":11, "y":4, "w":1.5 },
-        { "matrix": [4, 12], "x":12.5, "y":4 },
-        { "matrix": [4, 13], "x":13.5, "y":4, "w":1.5 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 1.5, "y": 1},
+        {"matrix": [1, 2], "x": 2.5, "y": 1},
+        {"matrix": [1, 3], "x": 3.5, "y": 1},
+        {"matrix": [1, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 5], "x": 5.5, "y": 1},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+        {"matrix": [1, 11], "x": 11.5, "y": 1},
+        {"matrix": [1, 12], "x": 12.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [2, 6], "x": 6.75, "y": 2},
+        {"matrix": [2, 7], "x": 7.75, "y": 2},
+        {"matrix": [2, 8], "x": 8.75, "y": 2},
+        {"matrix": [2, 9], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 12], "x": 12.75, "y": 2},
+        {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3},
+        {"matrix": [3, 2], "x": 2.25, "y": 3},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3},
+        {"matrix": [3, 5], "x": 5.25, "y": 3},
+        {"matrix": [3, 6], "x": 6.25, "y": 3},
+        {"matrix": [3, 7], "x": 7.25, "y": 3},
+        {"matrix": [3, 8], "x": 8.25, "y": 3},
+        {"matrix": [3, 9], "x": 9.25, "y": 3},
+        {"matrix": [3, 10], "x": 10.25, "y": 3},
+        {"matrix": [3, 11], "x": 11.25, "y": 3},
+        {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4},
+        {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 4, "y": 4, "w": 7},
+        {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+        {"matrix": [4, 12], "x": 12.5, "y": 4},
+        {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
index 72bd8ae91b..168d2d06dc 100644
--- a/keyboards/synthlabs/solo/info.json
+++ b/keyboards/synthlabs/solo/info.json
@@ -29,57 +29,57 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0, 0]},
-                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]},
-                {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0, 2]},
-                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]},
-                {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 4]},
-                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]},
-                {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0, 6]},
+                {"label": "P2 1", "x": 3, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 0]},
+                {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
+                {"label": "P2 3", "x": 4, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 2]},
+                {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
+                {"label": "P2 5", "x": 5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 4]},
+                {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
+                {"label": "P2 7", "x": 6, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 6]},
 
-                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]},
-                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]},
-                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]},
+                {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
+                {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
+                {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
 
-                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]},
-                {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 1]},
-                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]},
-                {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 3]},
-                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]},
-                {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 5]},
-                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]}
+                {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
+                {"label": "P2 2", "x": 3.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 1]},
+                {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
+                {"label": "P2 4", "x": 4.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 3]},
+                {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
+                {"label": "P2 6", "x": 5.5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 5]},
+                {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
             ]
         },
         "LAYOUT_left": {
             "layout": [
-                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 1]},
-                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 3]},
-                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0, 5]},
+                {"label": "P1 2", "x": 3.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 1]},
+                {"label": "P1 4", "x": 4.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 3]},
+                {"label": "P1 6", "x": 5.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [0, 5]},
 
-                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1, 0]},
-                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]},
-                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1, 2]},
+                {"label": "Knob CCW", "x": 0, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
+                {"label": "Knob Press", "x": 0.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
+                {"label": "Knob CW", "x": 2, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
 
-                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2, 0]},
-                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2, 2]},
-                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2, 4]},
-                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2, 6]}
+                {"label": "P1 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 0]},
+                {"label": "P1 3", "x": 4, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 2]},
+                {"label": "P1 5", "x": 5, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 4]},
+                {"label": "P1 7", "x": 6, "y": 2, "w": 0.5, "h": 1.5, "matrix": [2, 6]}
             ]
         },
         "LAYOUT_right": {
             "layout": [
-                {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 5]},
-                {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 3]},
-                {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2, 1]},
+                {"label": "P2 6", "x": 0.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 5]},
+                {"label": "P2 4", "x": 1.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 3]},
+                {"label": "P2 2", "x": 2.5, "y": 0, "w": 0.5, "h": 1.5, "matrix": [2, 1]},
 
-                {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1, 0]},
-                {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1, 1]},
-                {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1, 2]},
+                {"label": "Knob CCW", "x": 4, "y": 1.25, "w": 0.5, "matrix": [1, 0]},
+                {"label": "Knob Press", "x": 4.5, "y": 1, "w": 1.5, "h": 1.5, "matrix": [1, 1]},
+                {"label": "Knob CW", "x": 6, "y": 1.25, "w": 0.5, "matrix": [1, 2]},
 
-                {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0, 6]},
-                {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0, 4]},
-                {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0, 2]},
-                {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0, 0]}
+                {"label": "P2 7", "x": 0, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 6]},
+                {"label": "P2 5", "x": 1, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 4]},
+                {"label": "P2 3", "x": 2, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 2]},
+                {"label": "P2 1", "x": 3, "y": 2, "w": 0.5, "h": 1.5, "matrix": [0, 0]}
             ]
         }
     }
diff --git a/keyboards/takashicompany/goat51/info.json b/keyboards/takashicompany/goat51/info.json
index bc162527b5..c424685713 100644
--- a/keyboards/takashicompany/goat51/info.json
+++ b/keyboards/takashicompany/goat51/info.json
@@ -15,25 +15,8 @@
         "rgblight": true
     },
     "matrix_pins": {
-        "cols": [
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5",
-            "D2"
-        ],
-        "rows": [
-            "F4",
-            "F5",
-            "F6",
-            "F7",
-            "B1",
-            "B3",
-            "B2",
-            "B6"
-        ]
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "encoder": {
         "rotary": [
@@ -70,430 +53,59 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 0.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 0.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 7.5,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 5], "x": 14, "y": 0.5},
+                {"matrix": [4, 6], "x": 15, "y": 0.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "y": 0.5},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 5], "x": 14, "y": 1.5},
+                {"matrix": [5, 6], "x": 15, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2.25},
+                {"matrix": [6, 5], "x": 14, "y": 2.5},
+                {"matrix": [6, 6], "x": 15, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [7, 0], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 11, "y": 3},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+                {"matrix": [7, 4], "x": 13, "y": 3.25},
+                {"matrix": [7, 5], "x": 14, "y": 3.5},
+                {"matrix": [7, 6], "x": 15, "y": 3.5},
+                {"matrix": [0, 6], "x": 7, "y": 1.5},
+                {"matrix": [4, 0], "x": 8, "y": 1.5}
             ]
         }
     }
diff --git a/keyboards/takashicompany/spreadwriter/info.json b/keyboards/takashicompany/spreadwriter/info.json
index 161ed5ed60..1ab624ebcd 100644
--- a/keyboards/takashicompany/spreadwriter/info.json
+++ b/keyboards/takashicompany/spreadwriter/info.json
@@ -13,25 +13,8 @@
         "nkro": true
     },
     "matrix_pins": {
-        "cols": [
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5",
-            "D2"
-        ],
-        "rows": [
-            "F4",
-            "F5",
-            "F6",
-            "F7",
-            "B1",
-            "B3",
-            "B2",
-            "B6"
-        ]
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "D2"],
+        "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "processor": "atmega32u4",
     "url": "https://github.com/takashicompany/spreadwriter",
@@ -69,454 +52,62 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 0.25
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 0.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 0.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        5,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 2
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 2.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 2,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 5,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 6,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 7.5,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 9,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 10,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 11,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 12,
-                    "y": 3
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 13,
-                    "y": 3.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 14,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 15,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 7,
-                    "y": 4.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 8,
-                    "y": 4.25
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.5},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [4, 1], "x": 10, "y": 0},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 5], "x": 14, "y": 0.5},
+                {"matrix": [4, 6], "x": 15, "y": 0.5},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 7.5, "y": 1},
+                {"matrix": [5, 1], "x": 10, "y": 1},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 5], "x": 14, "y": 1.5},
+                {"matrix": [5, 6], "x": 15, "y": 1.5},
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [6, 0], "x": 9, "y": 2},
+                {"matrix": [6, 1], "x": 10, "y": 2},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2},
+                {"matrix": [6, 4], "x": 13, "y": 2.25},
+                {"matrix": [6, 5], "x": 14, "y": 2.5},
+                {"matrix": [6, 6], "x": 15, "y": 2.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.5},
+                {"matrix": [3, 1], "x": 1, "y": 3.5},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [5, 0], "x": 7.5, "y": 3},
+                {"matrix": [7, 0], "x": 9, "y": 3},
+                {"matrix": [7, 1], "x": 10, "y": 3},
+                {"matrix": [7, 2], "x": 11, "y": 3},
+                {"matrix": [7, 3], "x": 12, "y": 3},
+                {"matrix": [7, 4], "x": 13, "y": 3.25},
+                {"matrix": [7, 5], "x": 14, "y": 3.5},
+                {"matrix": [7, 6], "x": 15, "y": 3.5},
+                {"matrix": [0, 6], "x": 7, "y": 4.25},
+                {"matrix": [4, 0], "x": 8, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/takashicompany/tightwriter/info.json b/keyboards/takashicompany/tightwriter/info.json
index a2e86fe27f..201e3f6ed5 100644
--- a/keyboards/takashicompany/tightwriter/info.json
+++ b/keyboards/takashicompany/tightwriter/info.json
@@ -14,22 +14,8 @@
         "rgblight": true
     },
     "matrix_pins": {
-        "cols": [
-            "D4",
-            "C6",
-            "D7",
-            "E6",
-            "B4",
-            "B5"
-        ],
-        "rows": [
-            "F6",
-            "F7",
-            "B1",
-            "B3",
-            "B2",
-            "B6"
-        ]
+        "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+        "rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
     },
     "url": "",
     "usb": {
@@ -58,41 +44,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0, "w": 1.25 },
-                { "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.25, "y": 0 },
-                { "matrix": [1, 0], "x": 6.25, "y": 0 },
-                { "matrix": [1, 1], "x": 7.25, "y": 0 },
-                { "matrix": [1, 2], "x": 8.25, "y": 0 },
-                { "matrix": [1, 3], "x": 9.25, "y": 0 },
-                { "matrix": [1, 4], "x": 10.25, "y": 0 },
-                { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75 },
-                { "matrix": [2, 1], "x": 1.75, "y": 1 },
-                { "matrix": [2, 2], "x": 2.75, "y": 1 },
-                { "matrix": [2, 3], "x": 3.75, "y": 1 },
-                { "matrix": [2, 4], "x": 4.75, "y": 1 },
-                { "matrix": [2, 5], "x": 5.75, "y": 1 },
-                { "matrix": [3, 0], "x": 6.75, "y": 1 },
-                { "matrix": [3, 1], "x": 7.75, "y": 1 },
-                { "matrix": [3, 2], "x": 8.75, "y": 1 },
-                { "matrix": [1, 5], "x": 10, "y": 1, "w": 1.25, "h": 2 },
-                { "matrix": [4, 0], "x": 0, "y": 2, "w": 2 },
-                { "matrix": [4, 1], "x": 2, "y": 2 },
-                { "matrix": [4, 2], "x": 3, "y": 2 },
-                { "matrix": [4, 3], "x": 4, "y": 2 },
-                { "matrix": [4, 4], "x": 5, "y": 2 },
-                { "matrix": [4, 5], "x": 6, "y": 2 },
-                { "matrix": [3, 3], "x": 7, "y": 2 },
-                { "matrix": [3, 4], "x": 8, "y": 2 },
-                { "matrix": [3, 5], "x": 9, "y": 2 },
-                { "matrix": [5, 0], "x": 0, "y": 3, "w": 1.25 },
-                { "matrix": [5, 1], "x": 1.25, "y": 3, "w": 1.25 },
-                { "matrix": [5, 2], "x": 2.5, "y": 3, "w": 6.25 },
-                { "matrix": [5, 3], "x": 8.75, "y": 3, "w": 1.25 },
-                { "matrix": [5, 4], "x": 10, "y": 3, "w": 1.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25},
+                {"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.25, "y": 0},
+                {"matrix": [1, 0], "x": 6.25, "y": 0},
+                {"matrix": [1, 1], "x": 7.25, "y": 0},
+                {"matrix": [1, 2], "x": 8.25, "y": 0},
+                {"matrix": [1, 3], "x": 9.25, "y": 0},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 1},
+                {"matrix": [2, 2], "x": 2.75, "y": 1},
+                {"matrix": [2, 3], "x": 3.75, "y": 1},
+                {"matrix": [2, 4], "x": 4.75, "y": 1},
+                {"matrix": [2, 5], "x": 5.75, "y": 1},
+                {"matrix": [3, 0], "x": 6.75, "y": 1},
+                {"matrix": [3, 1], "x": 7.75, "y": 1},
+                {"matrix": [3, 2], "x": 8.75, "y": 1},
+                {"matrix": [1, 5], "x": 10, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [4, 2], "x": 3, "y": 2},
+                {"matrix": [4, 3], "x": 4, "y": 2},
+                {"matrix": [4, 4], "x": 5, "y": 2},
+                {"matrix": [4, 5], "x": 6, "y": 2},
+                {"matrix": [3, 3], "x": 7, "y": 2},
+                {"matrix": [3, 4], "x": 8, "y": 2},
+                {"matrix": [3, 5], "x": 9, "y": 2},
+                {"matrix": [5, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 3, "w": 6.25},
+                {"matrix": [5, 3], "x": 8.75, "y": 3, "w": 1.25},
+                {"matrix": [5, 4], "x": 10, "y": 3, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/tanuki/info.json b/keyboards/tanuki/info.json
index fa6101de64..8a858cf4f0 100644
--- a/keyboards/tanuki/info.json
+++ b/keyboards/tanuki/info.json
@@ -21,51 +21,51 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [3, 1]},
-        {"x":1, "y":0, "matrix": [0, 0]},
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-        {"x":6, "y":0, "matrix": [0, 5]},
-        {"x":7, "y":0, "matrix": [0, 6]},
-        {"x":8, "y":0, "matrix": [0, 7]},
-        {"x":9, "y":0, "matrix": [0, 8]},
-        {"x":10, "y":0, "matrix": [0, 9]},
-        {"x":11, "y":0, "w":1.25, "matrix": [0, 10]},
+        {"x": 0, "y": 0, "matrix": [3, 1]},
+        {"x": 1, "y": 0, "matrix": [0, 0]},
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+        {"x": 6, "y": 0, "matrix": [0, 5]},
+        {"x": 7, "y": 0, "matrix": [0, 6]},
+        {"x": 8, "y": 0, "matrix": [0, 7]},
+        {"x": 9, "y": 0, "matrix": [0, 8]},
+        {"x": 10, "y": 0, "matrix": [0, 9]},
+        {"x": 11, "y": 0, "w": 1.25, "matrix": [0, 10]},
 
-        {"x":0, "y":1, "w":1.25, "matrix": [3, 0]},
-        {"x":1.25, "y":1, "matrix": [1, 0]},
-        {"x":2.25, "y":1, "matrix": [1, 1]},
-        {"x":3.25, "y":1, "matrix": [1, 2]},
-        {"x":4.25, "y":1, "matrix": [1, 3]},
-        {"x":5.25, "y":1, "matrix": [1, 4]},
-        {"x":6.25, "y":1, "matrix": [1, 5]},
-        {"x":7.25, "y":1, "matrix": [1, 6]},
-        {"x":8.25, "y":1, "matrix": [1, 7]},
-        {"x":9.25, "y":1, "matrix": [1, 8]},
-        {"x":10.25, "y":1, "matrix": [1, 9]},
-        {"x":11.25, "y":1, "matrix": [1, 10]},
+        {"x": 0, "y": 1, "w": 1.25, "matrix": [3, 0]},
+        {"x": 1.25, "y": 1, "matrix": [1, 0]},
+        {"x": 2.25, "y": 1, "matrix": [1, 1]},
+        {"x": 3.25, "y": 1, "matrix": [1, 2]},
+        {"x": 4.25, "y": 1, "matrix": [1, 3]},
+        {"x": 5.25, "y": 1, "matrix": [1, 4]},
+        {"x": 6.25, "y": 1, "matrix": [1, 5]},
+        {"x": 7.25, "y": 1, "matrix": [1, 6]},
+        {"x": 8.25, "y": 1, "matrix": [1, 7]},
+        {"x": 9.25, "y": 1, "matrix": [1, 8]},
+        {"x": 10.25, "y": 1, "matrix": [1, 9]},
+        {"x": 11.25, "y": 1, "matrix": [1, 10]},
 
-        {"x":0.25, "y":2, "w":1.5, "matrix": [2, 0]},
-        {"x":1.75, "y":2, "matrix": [2, 1]},
-        {"x":2.75, "y":2, "matrix": [2, 2]},
-        {"x":3.75, "y":2, "matrix": [2, 3]},
-        {"x":4.75, "y":2, "matrix": [2, 4]},
-        {"x":5.75, "y":2, "matrix": [2, 5]},
-        {"x":6.75, "y":2, "matrix": [2, 6]},
-        {"x":7.75, "y":2, "matrix": [2, 7]},
-        {"x":8.75, "y":2, "matrix": [2, 8]},
-        {"x":9.75, "y":2, "matrix": [2, 9]},
-        {"x":10.75, "y":2, "w":1.25, "matrix": [2, 10]},
+        {"x": 0.25, "y": 2, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.75, "y": 2, "matrix": [2, 1]},
+        {"x": 2.75, "y": 2, "matrix": [2, 2]},
+        {"x": 3.75, "y": 2, "matrix": [2, 3]},
+        {"x": 4.75, "y": 2, "matrix": [2, 4]},
+        {"x": 5.75, "y": 2, "matrix": [2, 5]},
+        {"x": 6.75, "y": 2, "matrix": [2, 6]},
+        {"x": 7.75, "y": 2, "matrix": [2, 7]},
+        {"x": 8.75, "y": 2, "matrix": [2, 8]},
+        {"x": 9.75, "y": 2, "matrix": [2, 9]},
+        {"x": 10.75, "y": 2, "w": 1.25, "matrix": [2, 10]},
 
-        {"x":1.25, "y":3, "w":1.25, "matrix": [3, 2]},
-        {"x":2.5, "y":3, "matrix": [3, 3]},
-        {"x":3.5, "y":3, "matrix": [3, 4]},
-        {"x":4.5, "y":3, "w":2, "matrix": [3, 5]},
-        {"x":6.5, "y":3, "w":2, "matrix": [3, 6]},
-        {"x":8.5, "y":3, "matrix": [3, 8]},
-        {"x":9.5, "y":3, "w":1.25, "matrix": [3, 9]}
+        {"x": 1.25, "y": 3, "w": 1.25, "matrix": [3, 2]},
+        {"x": 2.5, "y": 3, "matrix": [3, 3]},
+        {"x": 3.5, "y": 3, "matrix": [3, 4]},
+        {"x": 4.5, "y": 3, "w": 2, "matrix": [3, 5]},
+        {"x": 6.5, "y": 3, "w": 2, "matrix": [3, 6]},
+        {"x": 8.5, "y": 3, "matrix": [3, 8]},
+        {"x": 9.5, "y": 3, "w": 1.25, "matrix": [3, 9]}
       ]
     }
   }
diff --git a/keyboards/tau4/info.json b/keyboards/tau4/info.json
index b89a647221..f5acdbddd3 100644
--- a/keyboards/tau4/info.json
+++ b/keyboards/tau4/info.json
@@ -65,57 +65,57 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"label": "Mute", "matrix": [0, 0], "x":0, "y":0},
-                {"label": "Q", "matrix": [0, 1], "x":1, "y":0},
-                {"label": "W", "matrix": [0, 2], "x":2, "y":0},
-                {"label": "E", "matrix": [0, 3], "x":3, "y":0},
-                {"label": "R", "matrix": [0, 4], "x":4, "y":0},
-                {"label": "T", "matrix": [0, 5], "x":5, "y":0},
-                {"label": "Y", "matrix": [0, 6], "x":6, "y":0},
-                {"label": "U", "matrix": [0, 7], "x":7, "y":0},
-                {"label": "I", "matrix": [0, 8], "x":8, "y":0},
-                {"label": "O", "matrix": [0, 9], "x":9, "y":0},
-                {"label": "P", "matrix": [0, 10], "x":10, "y":0},
-                {"label": "Backspace", "matrix": [0, 11], "x":11, "y":0},
+                {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "Backspace", "matrix": [0, 11], "x": 11, "y": 0},
 
-                {"label": "Esc", "matrix": [1, 0], "x":0, "y":1},
-                {"label": "A", "matrix": [1, 1], "x":1, "y":1},
-                {"label": "S", "matrix": [1, 2], "x":2, "y":1},
-                {"label": "D", "matrix": [1, 3], "x":3, "y":1},
-                {"label": "F", "matrix": [1, 4], "x":4, "y":1},
-                {"label": "G", "matrix": [1, 5], "x":5, "y":1},
-                {"label": "H", "matrix": [1, 6], "x":6, "y":1},
-                {"label": "J", "matrix": [1, 7], "x":7, "y":1},
-                {"label": "K", "matrix": [1, 8], "x":8, "y":1},
-                {"label": "L", "matrix": [1, 9], "x":9, "y":1},
-                {"label": ";:", "matrix": [1, 10], "x":10, "y":1},
-                {"label": "'\"", "matrix": [1, 11], "x":11, "y":1},
+                {"label": "Esc", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "A", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9, "y": 1},
+                {"label": ";:", "matrix": [1, 10], "x": 10, "y": 1},
+                {"label": "'\"", "matrix": [1, 11], "x": 11, "y": 1},
 
-                {"label": "Shift", "matrix": [2, 0], "x":0, "y":2},
-                {"label": "Z", "matrix": [2, 1], "x":1, "y":2},
-                {"label": "X", "matrix": [2, 2], "x":2, "y":2},
-                {"label": "C", "matrix": [2, 3], "x":3, "y":2},
-                {"label": "V", "matrix": [2, 4], "x":4, "y":2},
-                {"label": "B", "matrix": [2, 5], "x":5, "y":2},
-                {"label": "N", "matrix": [2, 6], "x":6, "y":2},
-                {"label": "M", "matrix": [2, 7], "x":7, "y":2},
-                {"label": ",<", "matrix": [2, 8], "x":8, "y":2},
-                {"label": ".>", "matrix": [2, 9], "x":9, "y":2},
-                {"label": "/?", "matrix": [2, 10], "x":10, "y":2},
-                {"label": "Enter", "matrix": [2, 11], "x":11, "y":2},
+                {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "Z", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7, "y": 2},
+                {"label": ",<", "matrix": [2, 8], "x": 8, "y": 2},
+                {"label": ".>", "matrix": [2, 9], "x": 9, "y": 2},
+                {"label": "/?", "matrix": [2, 10], "x": 10, "y": 2},
+                {"label": "Enter", "matrix": [2, 11], "x": 11, "y": 2},
 
-                {"label": "Backspace", "matrix": [3, 0], "x":0, "y":3},
-                {"label": "Ctrl", "matrix": [3, 1], "x":1, "y":3},
-                {"label": "GUI", "matrix": [3, 2], "x":2, "y":3},
-                {"label": "Alt", "matrix": [3, 3], "x":3, "y":3},
-                {"label": "Lower", "matrix": [3, 4], "x":4, "y":3},
-                {"label": "Space", "matrix": [3, 5], "x":5, "y":3},
-                {"label": "Space", "matrix": [3, 6], "x":6, "y":3},
-                {"label": "Raise", "matrix": [3, 7], "x":7, "y":3},
-                {"label": "Left", "matrix": [3, 8], "x":8, "y":3},
-                {"label": "Down", "matrix": [3, 9], "x":9, "y":3},
-                {"label": "Up", "matrix": [3, 10], "x":10, "y":3},
-                {"label": "Right", "matrix": [3, 11], "x":11, "y":3}
+                {"label": "Backspace", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "Ctrl", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "GUI", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "Alt", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "Lower", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "Space", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "Space", "matrix": [3, 6], "x": 6, "y": 3},
+                {"label": "Raise", "matrix": [3, 7], "x": 7, "y": 3},
+                {"label": "Left", "matrix": [3, 8], "x": 8, "y": 3},
+                {"label": "Down", "matrix": [3, 9], "x": 9, "y": 3},
+                {"label": "Up", "matrix": [3, 10], "x": 10, "y": 3},
+                {"label": "Right", "matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/teahouse/ayleen/info.json b/keyboards/teahouse/ayleen/info.json
index db012d91ff..82fe593c85 100644
--- a/keyboards/teahouse/ayleen/info.json
+++ b/keyboards/teahouse/ayleen/info.json
@@ -5,34 +5,24 @@
     "maintainer": "Freather",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
-    "diode_direction":"COL2ROW",
+    "diode_direction": "COL2ROW",
     "features": {
         "rgblight": true,
       "bootmagic": false,
-      "command":false,
-      "console":false,
+      "command": false,
+      "console": false,
       "extrakey": true,
-      "mousekey":true,
-      "nkro":true
+      "mousekey": true,
+      "nkro": true
     },
-    "matrix_pins":{
+    "matrix_pins": {
       "rows": ["F0", "F1", "F4", "F5", "D4", "B0", "B1", "B2", "F7", "D5", "D3"],
-      "cols": [
-        "F6",
-        "D0",
-        "D1",
-        "D2",
-        "D6",
-        "D7",
-        "B4",
-        "B5",
-        "B6"
-      ]
+      "cols": ["F6", "D0", "D1", "D2", "D6", "D7", "B4", "B5", "B6"]
     },
     "ws2812": {
         "pin": "C7"
     },
-    "usb":{
+    "usb": {
       "vid": "0x5448",
       "pid": "0x4141",
       "device_version": "0.0.1"
@@ -40,98 +30,98 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "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":[5, 8], "x": 9.5, "y": 0 },
-                { "label": "F10", "matrix":[5, 7], "x": 10.75, "y": 0 },
-                { "label": "F11", "matrix":[5, 6], "x": 11.75, "y": 0 },
-                { "label": "F12", "matrix":[5, 5], "x": 12.75, "y": 0 },
-                { "label": "F13", "matrix":[5, 4], "x": 13.75, "y": 0 },
-                { "label": "Prtsc", "matrix":[5, 3], "x": 15.25, "y": 0 },
-                { "label": "Scrlk", "matrix":[5, 2], "x": 16.25, "y": 0 },
-                { "label": "Pause", "matrix":[5, 1], "x": 17.25, "y": 0 },
+                {"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": [5, 8], "x": 9.5, "y": 0},
+                {"label": "F10", "matrix": [5, 7], "x": 10.75, "y": 0},
+                {"label": "F11", "matrix": [5, 6], "x": 11.75, "y": 0},
+                {"label": "F12", "matrix": [5, 5], "x": 12.75, "y": 0},
+                {"label": "F13", "matrix": [5, 4], "x": 13.75, "y": 0},
+                {"label": "Prtsc", "matrix": [5, 3], "x": 15.25, "y": 0},
+                {"label": "Scrlk", "matrix": [5, 2], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [5, 1], "x": 17.25, "y": 0},
 
-                { "label": "～", "matrix":[1, 0], "x": 0, "y": 1.5 },
-                { "label": "1", "matrix":[1, 1], "x": 1, "y": 1.5 },
-                { "label": "2", "matrix":[1, 2], "x": 2, "y": 1.5 },
-                { "label": "3", "matrix":[1, 3], "x": 3, "y": 1.5 },
-                { "label": "4", "matrix":[1, 4], "x": 4, "y": 1.5 },
-                { "label": "5", "matrix":[1, 5], "x": 5, "y": 1.5 },
-                { "label": "6", "matrix":[1, 6], "x": 6, "y": 1.5 },
-                { "label": "7", "matrix":[1, 7], "x": 7, "y": 1.5 },
-                { "label": "8", "matrix":[1, 8], "x": 8, "y": 1.5 },
-                { "label": "9", "matrix":[6, 8], "x": 9, "y": 1.5 },
-                { "label": "0", "matrix":[6, 7], "x": 10, "y": 1.5 },
-                { "label": "-", "matrix":[6, 6], "x": 11, "y": 1.5 },
-                { "label": "=", "matrix":[6, 5], "x": 12, "y": 1.5 },
-                { "label": "backspace", "matrix":[6, 4], "x": 13, "y": 1.5, "w": 2 },
-                { "label": "insert", "matrix":[6, 3], "x": 15.25, "y": 1.5 },
-                { "label": "home", "matrix":[6, 2], "x": 16.25, "y": 1.5 },
-                { "label": "pg up", "matrix":[6, 1], "x": 17.25, "y": 1.5 },
+                {"label": "～", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5},
+                {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5},
+                {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5},
+                {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5},
+                {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5},
+                {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5},
+                {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5},
+                {"label": "9", "matrix": [6, 8], "x": 9, "y": 1.5},
+                {"label": "0", "matrix": [6, 7], "x": 10, "y": 1.5},
+                {"label": "-", "matrix": [6, 6], "x": 11, "y": 1.5},
+                {"label": "=", "matrix": [6, 5], "x": 12, "y": 1.5},
+                {"label": "backspace", "matrix": [6, 4], "x": 13, "y": 1.5, "w": 2},
+                {"label": "insert", "matrix": [6, 3], "x": 15.25, "y": 1.5},
+                {"label": "home", "matrix": [6, 2], "x": 16.25, "y": 1.5},
+                {"label": "pg up", "matrix": [6, 1], "x": 17.25, "y": 1.5},
 
-                { "label": "tab", "matrix":[2, 0], "x": 0, "y": 2.5, "w": 1.5 },
-                { "label": "q", "matrix":[2, 1], "x": 1.5, "y": 2.5 },
-                { "label": "w", "matrix":[2, 2], "x": 2.5, "y": 2.5 },
-                { "label": "e", "matrix":[2, 3], "x": 3.5, "y": 2.5 },
-                { "label": "r", "matrix":[2, 4], "x": 4.5, "y": 2.5 },
-                { "label": "t", "matrix":[2, 5], "x": 5.5, "y": 2.5 },
-                { "label": "y", "matrix":[2, 6], "x": 6.5, "y": 2.5 },
-                { "label": "u", "matrix":[2, 7], "x": 7.5, "y": 2.5 },
-                { "label": "i", "matrix":[2, 8], "x": 8.5, "y": 2.5 },
-                { "label": "o", "matrix":[7, 8], "x": 9.5, "y": 2.5 },
-                { "label": "p", "matrix":[7, 7], "x": 10.5, "y": 2.5 },
-                { "label": "{", "matrix":[7, 6], "x": 11.5, "y": 2.5 },
-                { "label": "}", "matrix":[7, 5], "x": 12.5, "y": 2.5 },
-                { "label": "|", "matrix":[7, 4], "x": 13.5, "y": 2.5, "w": 1.5 },
-                { "label": "delete", "matrix":[7, 3], "x": 15.25, "y": 2.5 },
-                { "label": "end", "matrix":[7, 2], "x": 16.25, "y": 2.5 },
-                { "label": "pg dn", "matrix":[7, 1], "x": 17.25, "y": 2.5 },
+                {"label": "tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"label": "q", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"label": "w", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"label": "e", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"label": "r", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"label": "t", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"label": "y", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"label": "u", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"label": "i", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"label": "o", "matrix": [7, 8], "x": 9.5, "y": 2.5},
+                {"label": "p", "matrix": [7, 7], "x": 10.5, "y": 2.5},
+                {"label": "{", "matrix": [7, 6], "x": 11.5, "y": 2.5},
+                {"label": "}", "matrix": [7, 5], "x": 12.5, "y": 2.5},
+                {"label": "|", "matrix": [7, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"label": "delete", "matrix": [7, 3], "x": 15.25, "y": 2.5},
+                {"label": "end", "matrix": [7, 2], "x": 16.25, "y": 2.5},
+                {"label": "pg dn", "matrix": [7, 1], "x": 17.25, "y": 2.5},
 
-                { "label": "capslock", "matrix":[3, 0], "x": 0, "y": 3.5, "w": 1.75 },
-                { "label": "a", "matrix":[3, 1], "x": 1.75, "y": 3.5 },
-                { "label": "s", "matrix":[3, 2], "x": 2.75, "y": 3.5 },
-                { "label": "d", "matrix":[3, 3], "x": 3.75, "y": 3.5 },
-                { "label": "f", "matrix":[3, 4], "x": 4.75, "y": 3.5 },
-                { "label": "g", "matrix":[3, 5], "x": 5.75, "y": 3.5 },
-                { "label": "h", "matrix":[3, 6], "x": 6.75, "y": 3.5 },
-                { "label": "j", "matrix":[3, 7], "x": 7.75, "y": 3.5 },
-                { "label": "k", "matrix":[3, 8], "x": 8.75, "y": 3.5 },
-                { "label": "l", "matrix":[8, 8], "x": 9.75, "y": 3.5 },
-                { "label": ";", "matrix":[8, 7], "x": 10.75, "y": 3.5 },
-                { "label": "'", "matrix":[8, 6], "x": 11.75, "y": 3.5 },
-                { "label": "enter", "matrix":[8, 5], "x": 12.75, "y": 3.5, "w": 2.25 },
+                {"label": "capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"label": "a", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"label": "s", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "d", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"label": "f", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"label": "g", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"label": "h", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"label": "j", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"label": "k", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"label": "l", "matrix": [8, 8], "x": 9.75, "y": 3.5},
+                {"label": ";", "matrix": [8, 7], "x": 10.75, "y": 3.5},
+                {"label": "'", "matrix": [8, 6], "x": 11.75, "y": 3.5},
+                {"label": "enter", "matrix": [8, 5], "x": 12.75, "y": 3.5, "w": 2.25},
 
-                { "label": "leftshift", "matrix":[4, 0], "x": 0, "y": 4.5, "w": 2.25 },
-                { "label": "z", "matrix":[4, 1], "x": 3.25, "y": 4.5 },
-                { "label": "x", "matrix":[4, 2], "x": 4.25, "y": 4.5 },
-                { "label": "c", "matrix":[4, 3], "x": 5.25, "y": 4.5 },
-                { "label": "v", "matrix":[4, 4], "x": 6.25, "y": 4.5 },
-                { "label": "b", "matrix":[4, 5], "x": 7.25, "y": 4.5 },
-                { "label": "n", "matrix":[4, 6], "x": 8.25, "y": 4.5 },
-                { "label": "m", "matrix":[4, 7], "x": 9.25, "y": 4.5 },
-                { "label": ",", "matrix":[4, 8], "x": 10.25, "y": 0 },
-                { "label": ".", "matrix":[9, 8], "x": 11.25, "y": 4.5 },
-                { "label": "/", "matrix":[9, 7], "x": 12.25, "y": 4.5 },
-                { "label": "rightshift", "matrix":[9, 6], "x": 13.25, "y": 4.5, "w": 2.75 },
-                { "label": "up", "matrix":[8, 2], "x": 18.25, "y": 4.5 },
+                {"label": "leftshift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"label": "z", "matrix": [4, 1], "x": 3.25, "y": 4.5},
+                {"label": "x", "matrix": [4, 2], "x": 4.25, "y": 4.5},
+                {"label": "c", "matrix": [4, 3], "x": 5.25, "y": 4.5},
+                {"label": "v", "matrix": [4, 4], "x": 6.25, "y": 4.5},
+                {"label": "b", "matrix": [4, 5], "x": 7.25, "y": 4.5},
+                {"label": "n", "matrix": [4, 6], "x": 8.25, "y": 4.5},
+                {"label": "m", "matrix": [4, 7], "x": 9.25, "y": 4.5},
+                {"label": ",", "matrix": [4, 8], "x": 10.25, "y": 0},
+                {"label": ".", "matrix": [9, 8], "x": 11.25, "y": 4.5},
+                {"label": "/", "matrix": [9, 7], "x": 12.25, "y": 4.5},
+                {"label": "rightshift", "matrix": [9, 6], "x": 13.25, "y": 4.5, "w": 2.75},
+                {"label": "up", "matrix": [8, 2], "x": 18.25, "y": 4.5},
 
-                { "label": "lctrl", "matrix":[10, 0], "x": 0, "y": 5.5, "w": 1.5 },
-                { "label": "lwin", "matrix":[10, 1], "x": 1.5, "y": 5.5 },
-                { "label": "lalt", "matrix":[10, 2], "x": 2.5, "y": 5.5, "w": 1.5 },
-                { "label": "space", "matrix":[10, 3], "x": 4, "y": 5.5, "w": 7 },
-                { "label": "ralt", "matrix":[10, 4], "x": 11, "y": 5.5, "w": 1.5 },
-                { "label": "rwin", "matrix":[10, 5], "x": 12.5, "y": 5.5, "w": 1 },
-                { "label": "rctrl", "matrix":[10, 8], "x": 13.5, "y": 5.5, "w":1.5},
-                { "label": "left", "matrix":[9, 3], "x": 15.25, "y": 5.5 },
-                { "label": "down", "matrix":[9, 2], "x": 16.25, "y": 5.5 },
-                { "label": "right", "matrix":[9, 1], "x": 17.25, "y": 5.5 }
+                {"label": "lctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"label": "lwin", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+                {"label": "lalt", "matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"label": "space", "matrix": [10, 3], "x": 4, "y": 5.5, "w": 7},
+                {"label": "ralt", "matrix": [10, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"label": "rwin", "matrix": [10, 5], "x": 12.5, "y": 5.5, "w": 1},
+                {"label": "rctrl", "matrix": [10, 8], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"label": "left", "matrix": [9, 3], "x": 15.25, "y": 5.5},
+                {"label": "down", "matrix": [9, 2], "x": 16.25, "y": 5.5},
+                {"label": "right", "matrix": [9, 1], "x": 17.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/teleport/native/ansi/info.json b/keyboards/teleport/native/ansi/info.json
index b0cf5ef3fa..30a420517e 100644
--- a/keyboards/teleport/native/ansi/info.json
+++ b/keyboards/teleport/native/ansi/info.json
@@ -6,95 +6,95 @@
     "layouts": {
         "LAYOUT_75_ansi": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[1, 0], "x":1, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[1, 1], "x":3, "y":0},
-                {"matrix":[0, 2], "x":4, "y":0},
-                {"matrix":[1, 2], "x":5, "y":0},
-                {"matrix":[0, 3], "x":6, "y":0},
-                {"matrix":[1, 3], "x":7, "y":0},
-                {"matrix":[0, 4], "x":8, "y":0},
-                {"matrix":[1, 4], "x":9, "y":0},
-                {"matrix":[0, 5], "x":10, "y":0},
-                {"matrix":[1, 5], "x":11, "y":0},
-                {"matrix":[0, 6], "x":12, "y":0},
-                {"matrix":[1, 6], "x":13, "y":0},
-                {"matrix":[0, 7], "x":14, "y":0},
-                {"matrix":[1, 7], "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"matrix":[2, 0], "x":0, "y":1},
-                {"matrix":[3, 0], "x":1, "y":1},
-                {"matrix":[2, 1], "x":2, "y":1},
-                {"matrix":[3, 1], "x":3, "y":1},
-                {"matrix":[2, 2], "x":4, "y":1},
-                {"matrix":[3, 2], "x":5, "y":1},
-                {"matrix":[2, 3], "x":6, "y":1},
-                {"matrix":[3, 3], "x":7, "y":1},
-                {"matrix":[2, 4], "x":8, "y":1},
-                {"matrix":[3, 4], "x":9, "y":1},
-                {"matrix":[2, 5], "x":10, "y":1},
-                {"matrix":[3, 5], "x":11, "y":1},
-                {"matrix":[2, 6], "x":12, "y":1},
-                {"matrix":[3, 6], "x":13, "y":1, "w":2},
-                {"matrix":[3, 7], "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"matrix":[4, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[4, 1], "x":1.5, "y":2},
-                {"matrix":[5, 1], "x":2.5, "y":2},
-                {"matrix":[4, 2], "x":3.5, "y":2},
-                {"matrix":[5, 2], "x":4.5, "y":2},
-                {"matrix":[4, 3], "x":5.5, "y":2},
-                {"matrix":[5, 3], "x":6.5, "y":2},
-                {"matrix":[4, 4], "x":7.5, "y":2},
-                {"matrix":[5, 4], "x":8.5, "y":2},
-                {"matrix":[4, 5], "x":9.5, "y":2},
-                {"matrix":[5, 5], "x":10.5, "y":2},
-                {"matrix":[4, 6], "x":11.5, "y":2},
-                {"matrix":[5, 6], "x":12.5, "y":2},
-                {"matrix":[4, 7], "x":13.5, "y":2, "w":1.5},
-                {"matrix":[5, 7], "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 2},
+                {"matrix": [5, 1], "x": 2.5, "y": 2},
+                {"matrix": [4, 2], "x": 3.5, "y": 2},
+                {"matrix": [5, 2], "x": 4.5, "y": 2},
+                {"matrix": [4, 3], "x": 5.5, "y": 2},
+                {"matrix": [5, 3], "x": 6.5, "y": 2},
+                {"matrix": [4, 4], "x": 7.5, "y": 2},
+                {"matrix": [5, 4], "x": 8.5, "y": 2},
+                {"matrix": [4, 5], "x": 9.5, "y": 2},
+                {"matrix": [5, 5], "x": 10.5, "y": 2},
+                {"matrix": [4, 6], "x": 11.5, "y": 2},
+                {"matrix": [5, 6], "x": 12.5, "y": 2},
+                {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"matrix":[6, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[7, 0], "x":1.75, "y":3},
-                {"matrix":[6, 1], "x":2.75, "y":3},
-                {"matrix":[7, 1], "x":3.75, "y":3},
-                {"matrix":[6, 2], "x":4.75, "y":3},
-                {"matrix":[7, 2], "x":5.75, "y":3},
-                {"matrix":[6, 3], "x":6.75, "y":3},
-                {"matrix":[7, 3], "x":7.75, "y":3},
-                {"matrix":[6, 4], "x":8.75, "y":3},
-                {"matrix":[7, 4], "x":9.75, "y":3},
-                {"matrix":[6, 5], "x":10.75, "y":3},
-                {"matrix":[7, 5], "x":11.75, "y":3},
-                {"matrix":[6, 7], "x":12.75, "y":3, "w":2.25},
-                {"matrix":[7, 7], "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 7], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"matrix":[8, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[8, 1], "x":2.25, "y":4},
-                {"matrix":[9, 1], "x":3.25, "y":4},
-                {"matrix":[8, 2], "x":4.25, "y":4},
-                {"matrix":[9, 2], "x":5.25, "y":4},
-                {"matrix":[8, 3], "x":6.25, "y":4},
-                {"matrix":[9, 3], "x":7.25, "y":4},
-                {"matrix":[8, 4], "x":8.25, "y":4},
-                {"matrix":[9, 4], "x":9.25, "y":4},
-                {"matrix":[8, 5], "x":10.25, "y":4},
-                {"matrix":[9, 5], "x":11.25, "y":4},
-                {"matrix":[9, 6], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[8, 7], "x":14, "y":4},
-                {"matrix":[9, 7], "x":15, "y":4},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
 
-                {"matrix":[10, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[11, 0], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[11, 1], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[10, 1], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[10, 5], "x":10, "y":5},
-                {"matrix":[11, 5], "x":11, "y":5},
-                {"matrix":[10, 6], "x":12, "y":5},
-                {"matrix":[11, 6], "x":13, "y":5},
-                {"matrix":[10, 7], "x":14, "y":5},
-                {"matrix":[11, 7], "x":15, "y":5}
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [11, 1], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [10, 1], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5},
+                {"matrix": [11, 5], "x": 11, "y": 5},
+                {"matrix": [10, 6], "x": 12, "y": 5},
+                {"matrix": [11, 6], "x": 13, "y": 5},
+                {"matrix": [10, 7], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/teleport/native/iso/info.json b/keyboards/teleport/native/iso/info.json
index 1f4fbf49d0..57c5cdb308 100644
--- a/keyboards/teleport/native/iso/info.json
+++ b/keyboards/teleport/native/iso/info.json
@@ -6,96 +6,96 @@
     "layouts": {
         "LAYOUT_75_iso": {
             "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[1, 0], "x":1, "y":0},
-                {"matrix":[0, 1], "x":2, "y":0},
-                {"matrix":[1, 1], "x":3, "y":0},
-                {"matrix":[0, 2], "x":4, "y":0},
-                {"matrix":[1, 2], "x":5, "y":0},
-                {"matrix":[0, 3], "x":6, "y":0},
-                {"matrix":[1, 3], "x":7, "y":0},
-                {"matrix":[0, 4], "x":8, "y":0},
-                {"matrix":[1, 4], "x":9, "y":0},
-                {"matrix":[0, 5], "x":10, "y":0},
-                {"matrix":[1, 5], "x":11, "y":0},
-                {"matrix":[0, 6], "x":12, "y":0},
-                {"matrix":[1, 6], "x":13, "y":0},
-                {"matrix":[0, 7], "x":14, "y":0},
-                {"matrix":[1, 7], "x":15, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0},
+                {"matrix": [0, 7], "x": 14, "y": 0},
+                {"matrix": [1, 7], "x": 15, "y": 0},
 
-                {"matrix":[2, 0], "x":0, "y":1},
-                {"matrix":[3, 0], "x":1, "y":1},
-                {"matrix":[2, 1], "x":2, "y":1},
-                {"matrix":[3, 1], "x":3, "y":1},
-                {"matrix":[2, 2], "x":4, "y":1},
-                {"matrix":[3, 2], "x":5, "y":1},
-                {"matrix":[2, 3], "x":6, "y":1},
-                {"matrix":[3, 3], "x":7, "y":1},
-                {"matrix":[2, 4], "x":8, "y":1},
-                {"matrix":[3, 4], "x":9, "y":1},
-                {"matrix":[2, 5], "x":10, "y":1},
-                {"matrix":[3, 5], "x":11, "y":1},
-                {"matrix":[2, 6], "x":12, "y":1},
-                {"matrix":[3, 6], "x":13, "y":1, "w":2},
-                {"matrix":[3, 7], "x":15, "y":1},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+                {"matrix": [3, 6], "x": 13, "y": 1, "w": 2},
+                {"matrix": [3, 7], "x": 15, "y": 1},
 
-                {"matrix":[4, 0], "x":0, "y":2, "w":1.5},
-                {"matrix":[4, 1], "x":1.5, "y":2},
-                {"matrix":[5, 1], "x":2.5, "y":2},
-                {"matrix":[4, 2], "x":3.5, "y":2},
-                {"matrix":[5, 2], "x":4.5, "y":2},
-                {"matrix":[4, 3], "x":5.5, "y":2},
-                {"matrix":[5, 3], "x":6.5, "y":2},
-                {"matrix":[4, 4], "x":7.5, "y":2},
-                {"matrix":[5, 4], "x":8.5, "y":2},
-                {"matrix":[4, 5], "x":9.5, "y":2},
-                {"matrix":[5, 5], "x":10.5, "y":2},
-                {"matrix":[4, 6], "x":11.5, "y":2},
-                {"matrix":[5, 6], "x":12.5, "y":2},
-                {"matrix":[5, 7], "x":15, "y":2},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 2},
+                {"matrix": [5, 1], "x": 2.5, "y": 2},
+                {"matrix": [4, 2], "x": 3.5, "y": 2},
+                {"matrix": [5, 2], "x": 4.5, "y": 2},
+                {"matrix": [4, 3], "x": 5.5, "y": 2},
+                {"matrix": [5, 3], "x": 6.5, "y": 2},
+                {"matrix": [4, 4], "x": 7.5, "y": 2},
+                {"matrix": [5, 4], "x": 8.5, "y": 2},
+                {"matrix": [4, 5], "x": 9.5, "y": 2},
+                {"matrix": [5, 5], "x": 10.5, "y": 2},
+                {"matrix": [4, 6], "x": 11.5, "y": 2},
+                {"matrix": [5, 6], "x": 12.5, "y": 2},
+                {"matrix": [5, 7], "x": 15, "y": 2},
 
-                {"matrix":[6, 0], "x":0, "y":3, "w":1.75},
-                {"matrix":[7, 0], "x":1.75, "y":3},
-                {"matrix":[6, 1], "x":2.75, "y":3},
-                {"matrix":[7, 1], "x":3.75, "y":3},
-                {"matrix":[6, 2], "x":4.75, "y":3},
-                {"matrix":[7, 2], "x":5.75, "y":3},
-                {"matrix":[6, 3], "x":6.75, "y":3},
-                {"matrix":[7, 3], "x":7.75, "y":3},
-                {"matrix":[6, 4], "x":8.75, "y":3},
-                {"matrix":[7, 4], "x":9.75, "y":3},
-                {"matrix":[6, 5], "x":10.75, "y":3},
-                {"matrix":[7, 5], "x":11.75, "y":3},
-                {"matrix":[6, 7], "x":12.75, "y":3},
-                {"matrix":[4, 7], "x":13.75, "y":2, "w":1.25, "h":2},
-                {"matrix":[7, 7], "x":15, "y":3},
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [7, 1], "x": 3.75, "y": 3},
+                {"matrix": [6, 2], "x": 4.75, "y": 3},
+                {"matrix": [7, 2], "x": 5.75, "y": 3},
+                {"matrix": [6, 3], "x": 6.75, "y": 3},
+                {"matrix": [7, 3], "x": 7.75, "y": 3},
+                {"matrix": [6, 4], "x": 8.75, "y": 3},
+                {"matrix": [7, 4], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+                {"matrix": [7, 5], "x": 11.75, "y": 3},
+                {"matrix": [6, 7], "x": 12.75, "y": 3},
+                {"matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"matrix": [7, 7], "x": 15, "y": 3},
 
-                {"matrix":[8, 0], "x":0, "y":4, "w":1.25},
-                {"matrix":[9, 0], "x":1.25, "y":4},
-                {"matrix":[8, 1], "x":2.25, "y":4},
-                {"matrix":[9, 1], "x":3.25, "y":4},
-                {"matrix":[8, 2], "x":4.25, "y":4},
-                {"matrix":[9, 2], "x":5.25, "y":4},
-                {"matrix":[8, 3], "x":6.25, "y":4},
-                {"matrix":[9, 3], "x":7.25, "y":4},
-                {"matrix":[8, 4], "x":8.25, "y":4},
-                {"matrix":[9, 4], "x":9.25, "y":4},
-                {"matrix":[8, 5], "x":10.25, "y":4},
-                {"matrix":[9, 5], "x":11.25, "y":4},
-                {"matrix":[9, 6], "x":12.25, "y":4, "w":1.75},
-                {"matrix":[8, 7], "x":14, "y":4},
-                {"matrix":[9, 7], "x":15, "y":4},
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4},
+                {"matrix": [8, 1], "x": 2.25, "y": 4},
+                {"matrix": [9, 1], "x": 3.25, "y": 4},
+                {"matrix": [8, 2], "x": 4.25, "y": 4},
+                {"matrix": [9, 2], "x": 5.25, "y": 4},
+                {"matrix": [8, 3], "x": 6.25, "y": 4},
+                {"matrix": [9, 3], "x": 7.25, "y": 4},
+                {"matrix": [8, 4], "x": 8.25, "y": 4},
+                {"matrix": [9, 4], "x": 9.25, "y": 4},
+                {"matrix": [8, 5], "x": 10.25, "y": 4},
+                {"matrix": [9, 5], "x": 11.25, "y": 4},
+                {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [8, 7], "x": 14, "y": 4},
+                {"matrix": [9, 7], "x": 15, "y": 4},
 
-                {"matrix":[10, 0], "x":0, "y":5, "w":1.25},
-                {"matrix":[11, 0], "x":1.25, "y":5, "w":1.25},
-                {"matrix":[11, 1], "x":2.5, "y":5, "w":1.25},
-                {"matrix":[10, 1], "x":3.75, "y":5, "w":6.25},
-                {"matrix":[10, 5], "x":10, "y":5},
-                {"matrix":[11, 5], "x":11, "y":5},
-                {"matrix":[10, 6], "x":12, "y":5},
-                {"matrix":[11, 6], "x":13, "y":5},
-                {"matrix":[10, 7], "x":14, "y":5},
-                {"matrix":[11, 7], "x":15, "y":5}
+                {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [11, 0], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [11, 1], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [10, 1], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5},
+                {"matrix": [11, 5], "x": 11, "y": 5},
+                {"matrix": [10, 6], "x": 12, "y": 5},
+                {"matrix": [11, 6], "x": 13, "y": 5},
+                {"matrix": [10, 7], "x": 14, "y": 5},
+                {"matrix": [11, 7], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json
index 2fe282fbdf..7b6d03823a 100644
--- a/keyboards/tempo_turtle/bradpad/info.json
+++ b/keyboards/tempo_turtle/bradpad/info.json
@@ -4,14 +4,14 @@
     "url": "https://tempoturtle.com",
     "maintainer": "wxyangf",
     "diode_direction": "ROW2COL",
-    "matrix_pins":{
+    "matrix_pins": {
         "rows": ["B7", "D5", "C7", "D2", "D3"],
         "cols": ["D7", "E6", "B4", "F1"]
     },
-    "usb":{
-        "vid":"0x7474",
-        "pid":"0x6270",
-        "device_version":"0.0.1"
+    "usb": {
+        "vid": "0x7474",
+        "pid": "0x6270",
+        "device_version": "0.0.1"
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
diff --git a/keyboards/toad/info.json b/keyboards/toad/info.json
index 1a9dcccda1..f0dccbfe5a 100644
--- a/keyboards/toad/info.json
+++ b/keyboards/toad/info.json
@@ -23,432 +23,432 @@
   "layouts": {
     "LAYOUT_all": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-
-        {"x":6.5, "y":0, "matrix": [0, 5]},
-        {"x":7.5, "y":0, "matrix": [0, 6]},
-        {"x":8.5, "y":0, "matrix": [0, 7]},
-        {"x":9.5, "y":0, "matrix": [0, 8]},
-
-        {"x":11, "y":0, "matrix": [0, 9]},
-        {"x":12, "y":0, "matrix": [0, 10]},
-        {"x":13, "y":0, "matrix": [0, 11]},
-        {"x":14, "y":0, "matrix": [0, 12]},
-
-        {"x":0, "y":1.5, "matrix": [1, 0]},
-        {"x":1, "y":1.5, "matrix": [1, 1]},
-        {"x":2, "y":1.5, "matrix": [1, 2]},
-        {"x":3, "y":1.5, "matrix": [1, 3]},
-        {"x":4, "y":1.5, "matrix": [1, 4]},
-        {"x":5, "y":1.5, "matrix": [1, 5]},
-        {"x":6, "y":1.5, "matrix": [1, 6]},
-        {"x":7, "y":1.5, "matrix": [1, 7]},
-        {"x":8, "y":1.5, "matrix": [1, 8]},
-        {"x":9, "y":1.5, "matrix": [1, 9]},
-        {"x":10, "y":1.5, "matrix": [1, 10]},
-        {"x":11, "y":1.5, "matrix": [1, 11]},
-        {"x":12, "y":1.5, "matrix": [1, 12]},
-        {"x":13, "y":1.5, "matrix": [1, 13]},
-        {"x":14, "y":1.5, "matrix": [0, 13]},
-
-        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
-        {"x":1.5, "y":2.5, "matrix": [2, 1]},
-        {"x":2.5, "y":2.5, "matrix": [2, 2]},
-        {"x":3.5, "y":2.5, "matrix": [2, 3]},
-        {"x":4.5, "y":2.5, "matrix": [2, 4]},
-        {"x":5.5, "y":2.5, "matrix": [2, 5]},
-        {"x":6.5, "y":2.5, "matrix": [2, 6]},
-        {"x":7.5, "y":2.5, "matrix": [2, 7]},
-        {"x":8.5, "y":2.5, "matrix": [2, 8]},
-        {"x":9.5, "y":2.5, "matrix": [2, 9]},
-        {"x":10.5, "y":2.5, "matrix": [2, 10]},
-        {"x":11.5, "y":2.5, "matrix": [2, 11]},
-        {"x":12.5, "y":2.5, "matrix": [2, 12]},
-        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
-
-        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
-        {"x":1.75, "y":3.5, "matrix": [3, 1]},
-        {"x":2.75, "y":3.5, "matrix": [3, 2]},
-        {"x":3.75, "y":3.5, "matrix": [3, 3]},
-        {"x":4.75, "y":3.5, "matrix": [3, 4]},
-        {"x":5.75, "y":3.5, "matrix": [3, 5]},
-        {"x":6.75, "y":3.5, "matrix": [3, 6]},
-        {"x":7.75, "y":3.5, "matrix": [3, 7]},
-        {"x":8.75, "y":3.5, "matrix": [3, 8]},
-        {"x":9.75, "y":3.5, "matrix": [3, 9]},
-        {"x":10.75, "y":3.5, "matrix": [3, 10]},
-        {"x":11.75, "y":3.5, "matrix": [3, 11]},
-        {"x":12.75, "y":3.5, "matrix": [3, 12]},
-        {"x":13.75, "y":3.5, "w":1.25, "matrix": [3, 13]},
-
-        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
-        {"x":1.25, "y":4.5, "matrix": [4, 1]},
-        {"x":2.25, "y":4.5, "matrix": [4, 2]},
-        {"x":3.25, "y":4.5, "matrix": [4, 3]},
-        {"x":4.25, "y":4.5, "matrix": [4, 4]},
-        {"x":5.25, "y":4.5, "matrix": [4, 5]},
-        {"x":6.25, "y":4.5, "matrix": [4, 6]},
-        {"x":7.25, "y":4.5, "matrix": [4, 7]},
-        {"x":8.25, "y":4.5, "matrix": [4, 8]},
-        {"x":9.25, "y":4.5, "matrix": [4, 9]},
-        {"x":10.25, "y":4.5, "matrix": [4, 10]},
-        {"x":11.25, "y":4.5, "matrix": [4, 11]},
-        {"x":12.25, "y":4.5, "w":1.75, "matrix": [4, 12]},
-        {"x":14, "y":4.5, "matrix": [4, 13]},
-
-        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
-        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
-        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
-        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
-        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
-        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
-        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
-        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+
+        {"x": 6.5, "y": 0, "matrix": [0, 5]},
+        {"x": 7.5, "y": 0, "matrix": [0, 6]},
+        {"x": 8.5, "y": 0, "matrix": [0, 7]},
+        {"x": 9.5, "y": 0, "matrix": [0, 8]},
+
+        {"x": 11, "y": 0, "matrix": [0, 9]},
+        {"x": 12, "y": 0, "matrix": [0, 10]},
+        {"x": 13, "y": 0, "matrix": [0, 11]},
+        {"x": 14, "y": 0, "matrix": [0, 12]},
+
+        {"x": 0, "y": 1.5, "matrix": [1, 0]},
+        {"x": 1, "y": 1.5, "matrix": [1, 1]},
+        {"x": 2, "y": 1.5, "matrix": [1, 2]},
+        {"x": 3, "y": 1.5, "matrix": [1, 3]},
+        {"x": 4, "y": 1.5, "matrix": [1, 4]},
+        {"x": 5, "y": 1.5, "matrix": [1, 5]},
+        {"x": 6, "y": 1.5, "matrix": [1, 6]},
+        {"x": 7, "y": 1.5, "matrix": [1, 7]},
+        {"x": 8, "y": 1.5, "matrix": [1, 8]},
+        {"x": 9, "y": 1.5, "matrix": [1, 9]},
+        {"x": 10, "y": 1.5, "matrix": [1, 10]},
+        {"x": 11, "y": 1.5, "matrix": [1, 11]},
+        {"x": 12, "y": 1.5, "matrix": [1, 12]},
+        {"x": 13, "y": 1.5, "matrix": [1, 13]},
+        {"x": 14, "y": 1.5, "matrix": [0, 13]},
+
+        {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+        {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+        {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+        {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+        {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+        {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+        {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+        {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+        {"x": 9.5, "y": 2.5, "matrix": [2, 9]},
+        {"x": 10.5, "y": 2.5, "matrix": [2, 10]},
+        {"x": 11.5, "y": 2.5, "matrix": [2, 11]},
+        {"x": 12.5, "y": 2.5, "matrix": [2, 12]},
+        {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [2, 13]},
+
+        {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+        {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+        {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+        {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+        {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+        {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+        {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+        {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+        {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+        {"x": 9.75, "y": 3.5, "matrix": [3, 9]},
+        {"x": 10.75, "y": 3.5, "matrix": [3, 10]},
+        {"x": 11.75, "y": 3.5, "matrix": [3, 11]},
+        {"x": 12.75, "y": 3.5, "matrix": [3, 12]},
+        {"x": 13.75, "y": 3.5, "w": 1.25, "matrix": [3, 13]},
+
+        {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
+        {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
+        {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+        {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+        {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+        {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+        {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+        {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+        {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+        {"x": 9.25, "y": 4.5, "matrix": [4, 9]},
+        {"x": 10.25, "y": 4.5, "matrix": [4, 10]},
+        {"x": 11.25, "y": 4.5, "matrix": [4, 11]},
+        {"x": 12.25, "y": 4.5, "w": 1.75, "matrix": [4, 12]},
+        {"x": 14, "y": 4.5, "matrix": [4, 13]},
+
+        {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
+        {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
+        {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
+        {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 7]},
+        {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 10]},
+        {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 11]},
+        {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 12]},
+        {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 13]}
       ]
     },
     "LAYOUT_ansi_wk": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-
-        {"x":6.5, "y":0, "matrix": [0, 5]},
-        {"x":7.5, "y":0, "matrix": [0, 6]},
-        {"x":8.5, "y":0, "matrix": [0, 7]},
-        {"x":9.5, "y":0, "matrix": [0, 8]},
-
-        {"x":11, "y":0, "matrix": [0, 9]},
-        {"x":12, "y":0, "matrix": [0, 10]},
-        {"x":13, "y":0, "matrix": [0, 11]},
-        {"x":14, "y":0, "matrix": [0, 12]},
-
-        {"x":0, "y":1.5, "matrix": [1, 0]},
-        {"x":1, "y":1.5, "matrix": [1, 1]},
-        {"x":2, "y":1.5, "matrix": [1, 2]},
-        {"x":3, "y":1.5, "matrix": [1, 3]},
-        {"x":4, "y":1.5, "matrix": [1, 4]},
-        {"x":5, "y":1.5, "matrix": [1, 5]},
-        {"x":6, "y":1.5, "matrix": [1, 6]},
-        {"x":7, "y":1.5, "matrix": [1, 7]},
-        {"x":8, "y":1.5, "matrix": [1, 8]},
-        {"x":9, "y":1.5, "matrix": [1, 9]},
-        {"x":10, "y":1.5, "matrix": [1, 10]},
-        {"x":11, "y":1.5, "matrix": [1, 11]},
-        {"x":12, "y":1.5, "matrix": [1, 12]},
-        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
-
-        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
-        {"x":1.5, "y":2.5, "matrix": [2, 1]},
-        {"x":2.5, "y":2.5, "matrix": [2, 2]},
-        {"x":3.5, "y":2.5, "matrix": [2, 3]},
-        {"x":4.5, "y":2.5, "matrix": [2, 4]},
-        {"x":5.5, "y":2.5, "matrix": [2, 5]},
-        {"x":6.5, "y":2.5, "matrix": [2, 6]},
-        {"x":7.5, "y":2.5, "matrix": [2, 7]},
-        {"x":8.5, "y":2.5, "matrix": [2, 8]},
-        {"x":9.5, "y":2.5, "matrix": [2, 9]},
-        {"x":10.5, "y":2.5, "matrix": [2, 10]},
-        {"x":11.5, "y":2.5, "matrix": [2, 11]},
-        {"x":12.5, "y":2.5, "matrix": [2, 12]},
-        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
-
-        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
-        {"x":1.75, "y":3.5, "matrix": [3, 1]},
-        {"x":2.75, "y":3.5, "matrix": [3, 2]},
-        {"x":3.75, "y":3.5, "matrix": [3, 3]},
-        {"x":4.75, "y":3.5, "matrix": [3, 4]},
-        {"x":5.75, "y":3.5, "matrix": [3, 5]},
-        {"x":6.75, "y":3.5, "matrix": [3, 6]},
-        {"x":7.75, "y":3.5, "matrix": [3, 7]},
-        {"x":8.75, "y":3.5, "matrix": [3, 8]},
-        {"x":9.75, "y":3.5, "matrix": [3, 9]},
-        {"x":10.75, "y":3.5, "matrix": [3, 10]},
-        {"x":11.75, "y":3.5, "matrix": [3, 11]},
-        {"x":12.75, "y":3.5, "w":2.25, "matrix": [3, 13]},
-
-        {"x":0, "y":4.5, "w":2.25, "matrix": [4, 0]},
-        {"x":2.25, "y":4.5, "matrix": [4, 2]},
-        {"x":3.25, "y":4.5, "matrix": [4, 3]},
-        {"x":4.25, "y":4.5, "matrix": [4, 4]},
-        {"x":5.25, "y":4.5, "matrix": [4, 5]},
-        {"x":6.25, "y":4.5, "matrix": [4, 6]},
-        {"x":7.25, "y":4.5, "matrix": [4, 7]},
-        {"x":8.25, "y":4.5, "matrix": [4, 8]},
-        {"x":9.25, "y":4.5, "matrix": [4, 9]},
-        {"x":10.25, "y":4.5, "matrix": [4, 10]},
-        {"x":11.25, "y":4.5, "matrix": [4, 11]},
-        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
-
-        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
-        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
-        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
-        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
-        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
-        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
-        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
-        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+
+        {"x": 6.5, "y": 0, "matrix": [0, 5]},
+        {"x": 7.5, "y": 0, "matrix": [0, 6]},
+        {"x": 8.5, "y": 0, "matrix": [0, 7]},
+        {"x": 9.5, "y": 0, "matrix": [0, 8]},
+
+        {"x": 11, "y": 0, "matrix": [0, 9]},
+        {"x": 12, "y": 0, "matrix": [0, 10]},
+        {"x": 13, "y": 0, "matrix": [0, 11]},
+        {"x": 14, "y": 0, "matrix": [0, 12]},
+
+        {"x": 0, "y": 1.5, "matrix": [1, 0]},
+        {"x": 1, "y": 1.5, "matrix": [1, 1]},
+        {"x": 2, "y": 1.5, "matrix": [1, 2]},
+        {"x": 3, "y": 1.5, "matrix": [1, 3]},
+        {"x": 4, "y": 1.5, "matrix": [1, 4]},
+        {"x": 5, "y": 1.5, "matrix": [1, 5]},
+        {"x": 6, "y": 1.5, "matrix": [1, 6]},
+        {"x": 7, "y": 1.5, "matrix": [1, 7]},
+        {"x": 8, "y": 1.5, "matrix": [1, 8]},
+        {"x": 9, "y": 1.5, "matrix": [1, 9]},
+        {"x": 10, "y": 1.5, "matrix": [1, 10]},
+        {"x": 11, "y": 1.5, "matrix": [1, 11]},
+        {"x": 12, "y": 1.5, "matrix": [1, 12]},
+        {"x": 13, "y": 1.5, "w": 2, "matrix": [0, 13]},
+
+        {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+        {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+        {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+        {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+        {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+        {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+        {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+        {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+        {"x": 9.5, "y": 2.5, "matrix": [2, 9]},
+        {"x": 10.5, "y": 2.5, "matrix": [2, 10]},
+        {"x": 11.5, "y": 2.5, "matrix": [2, 11]},
+        {"x": 12.5, "y": 2.5, "matrix": [2, 12]},
+        {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [2, 13]},
+
+        {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+        {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+        {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+        {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+        {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+        {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+        {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+        {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+        {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+        {"x": 9.75, "y": 3.5, "matrix": [3, 9]},
+        {"x": 10.75, "y": 3.5, "matrix": [3, 10]},
+        {"x": 11.75, "y": 3.5, "matrix": [3, 11]},
+        {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [3, 13]},
+
+        {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]},
+        {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+        {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+        {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+        {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+        {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+        {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+        {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+        {"x": 9.25, "y": 4.5, "matrix": [4, 9]},
+        {"x": 10.25, "y": 4.5, "matrix": [4, 10]},
+        {"x": 11.25, "y": 4.5, "matrix": [4, 11]},
+        {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [4, 12]},
+
+        {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
+        {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
+        {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
+        {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 7]},
+        {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 10]},
+        {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 11]},
+        {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 12]},
+        {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 13]}
       ]
     },
     "LAYOUT_ansi_wkl": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-
-        {"x":6.5, "y":0, "matrix": [0, 5]},
-        {"x":7.5, "y":0, "matrix": [0, 6]},
-        {"x":8.5, "y":0, "matrix": [0, 7]},
-        {"x":9.5, "y":0, "matrix": [0, 8]},
-
-        {"x":11, "y":0, "matrix": [0, 9]},
-        {"x":12, "y":0, "matrix": [0, 10]},
-        {"x":13, "y":0, "matrix": [0, 11]},
-        {"x":14, "y":0, "matrix": [0, 12]},
-
-        {"x":0, "y":1.5, "matrix": [1, 0]},
-        {"x":1, "y":1.5, "matrix": [1, 1]},
-        {"x":2, "y":1.5, "matrix": [1, 2]},
-        {"x":3, "y":1.5, "matrix": [1, 3]},
-        {"x":4, "y":1.5, "matrix": [1, 4]},
-        {"x":5, "y":1.5, "matrix": [1, 5]},
-        {"x":6, "y":1.5, "matrix": [1, 6]},
-        {"x":7, "y":1.5, "matrix": [1, 7]},
-        {"x":8, "y":1.5, "matrix": [1, 8]},
-        {"x":9, "y":1.5, "matrix": [1, 9]},
-        {"x":10, "y":1.5, "matrix": [1, 10]},
-        {"x":11, "y":1.5, "matrix": [1, 11]},
-        {"x":12, "y":1.5, "matrix": [1, 12]},
-        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
-
-        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
-        {"x":1.5, "y":2.5, "matrix": [2, 1]},
-        {"x":2.5, "y":2.5, "matrix": [2, 2]},
-        {"x":3.5, "y":2.5, "matrix": [2, 3]},
-        {"x":4.5, "y":2.5, "matrix": [2, 4]},
-        {"x":5.5, "y":2.5, "matrix": [2, 5]},
-        {"x":6.5, "y":2.5, "matrix": [2, 6]},
-        {"x":7.5, "y":2.5, "matrix": [2, 7]},
-        {"x":8.5, "y":2.5, "matrix": [2, 8]},
-        {"x":9.5, "y":2.5, "matrix": [2, 9]},
-        {"x":10.5, "y":2.5, "matrix": [2, 10]},
-        {"x":11.5, "y":2.5, "matrix": [2, 11]},
-        {"x":12.5, "y":2.5, "matrix": [2, 12]},
-        {"x":13.5, "y":2.5, "w":1.5, "matrix": [2, 13]},
-
-        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
-        {"x":1.75, "y":3.5, "matrix": [3, 1]},
-        {"x":2.75, "y":3.5, "matrix": [3, 2]},
-        {"x":3.75, "y":3.5, "matrix": [3, 3]},
-        {"x":4.75, "y":3.5, "matrix": [3, 4]},
-        {"x":5.75, "y":3.5, "matrix": [3, 5]},
-        {"x":6.75, "y":3.5, "matrix": [3, 6]},
-        {"x":7.75, "y":3.5, "matrix": [3, 7]},
-        {"x":8.75, "y":3.5, "matrix": [3, 8]},
-        {"x":9.75, "y":3.5, "matrix": [3, 9]},
-        {"x":10.75, "y":3.5, "matrix": [3, 10]},
-        {"x":11.75, "y":3.5, "matrix": [3, 11]},
-        {"x":12.75, "y":3.5, "w":2.25, "matrix": [3, 13]},
-
-        {"x":0, "y":4.5, "w":2.25, "matrix": [4, 0]},
-        {"x":2.25, "y":4.5, "matrix": [4, 2]},
-        {"x":3.25, "y":4.5, "matrix": [4, 3]},
-        {"x":4.25, "y":4.5, "matrix": [4, 4]},
-        {"x":5.25, "y":4.5, "matrix": [4, 5]},
-        {"x":6.25, "y":4.5, "matrix": [4, 6]},
-        {"x":7.25, "y":4.5, "matrix": [4, 7]},
-        {"x":8.25, "y":4.5, "matrix": [4, 8]},
-        {"x":9.25, "y":4.5, "matrix": [4, 9]},
-        {"x":10.25, "y":4.5, "matrix": [4, 10]},
-        {"x":11.25, "y":4.5, "matrix": [4, 11]},
-        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
-
-        {"x":0, "y":5.5, "w":1.5, "matrix": [5, 0]},
-        {"x":2.5, "y":5.5, "w":1.5, "matrix": [5, 2]},
-        {"x":4, "y":5.5, "w":7, "matrix": [5, 7]},
-        {"x":11, "y":5.5, "w":1.5, "matrix": [5, 11]},
-        {"x":13.5, "y":5.5, "w":1.5, "matrix": [5, 13]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+
+        {"x": 6.5, "y": 0, "matrix": [0, 5]},
+        {"x": 7.5, "y": 0, "matrix": [0, 6]},
+        {"x": 8.5, "y": 0, "matrix": [0, 7]},
+        {"x": 9.5, "y": 0, "matrix": [0, 8]},
+
+        {"x": 11, "y": 0, "matrix": [0, 9]},
+        {"x": 12, "y": 0, "matrix": [0, 10]},
+        {"x": 13, "y": 0, "matrix": [0, 11]},
+        {"x": 14, "y": 0, "matrix": [0, 12]},
+
+        {"x": 0, "y": 1.5, "matrix": [1, 0]},
+        {"x": 1, "y": 1.5, "matrix": [1, 1]},
+        {"x": 2, "y": 1.5, "matrix": [1, 2]},
+        {"x": 3, "y": 1.5, "matrix": [1, 3]},
+        {"x": 4, "y": 1.5, "matrix": [1, 4]},
+        {"x": 5, "y": 1.5, "matrix": [1, 5]},
+        {"x": 6, "y": 1.5, "matrix": [1, 6]},
+        {"x": 7, "y": 1.5, "matrix": [1, 7]},
+        {"x": 8, "y": 1.5, "matrix": [1, 8]},
+        {"x": 9, "y": 1.5, "matrix": [1, 9]},
+        {"x": 10, "y": 1.5, "matrix": [1, 10]},
+        {"x": 11, "y": 1.5, "matrix": [1, 11]},
+        {"x": 12, "y": 1.5, "matrix": [1, 12]},
+        {"x": 13, "y": 1.5, "w": 2, "matrix": [0, 13]},
+
+        {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+        {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+        {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+        {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+        {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+        {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+        {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+        {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+        {"x": 9.5, "y": 2.5, "matrix": [2, 9]},
+        {"x": 10.5, "y": 2.5, "matrix": [2, 10]},
+        {"x": 11.5, "y": 2.5, "matrix": [2, 11]},
+        {"x": 12.5, "y": 2.5, "matrix": [2, 12]},
+        {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [2, 13]},
+
+        {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+        {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+        {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+        {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+        {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+        {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+        {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+        {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+        {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+        {"x": 9.75, "y": 3.5, "matrix": [3, 9]},
+        {"x": 10.75, "y": 3.5, "matrix": [3, 10]},
+        {"x": 11.75, "y": 3.5, "matrix": [3, 11]},
+        {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [3, 13]},
+
+        {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]},
+        {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+        {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+        {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+        {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+        {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+        {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+        {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+        {"x": 9.25, "y": 4.5, "matrix": [4, 9]},
+        {"x": 10.25, "y": 4.5, "matrix": [4, 10]},
+        {"x": 11.25, "y": 4.5, "matrix": [4, 11]},
+        {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [4, 12]},
+
+        {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]},
+        {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]},
+        {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 7]},
+        {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 11]},
+        {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 13]}
       ]
     },
     "LAYOUT_iso_wk": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-
-        {"x":6.5, "y":0, "matrix": [0, 5]},
-        {"x":7.5, "y":0, "matrix": [0, 6]},
-        {"x":8.5, "y":0, "matrix": [0, 7]},
-        {"x":9.5, "y":0, "matrix": [0, 8]},
-
-        {"x":11, "y":0, "matrix": [0, 9]},
-        {"x":12, "y":0, "matrix": [0, 10]},
-        {"x":13, "y":0, "matrix": [0, 11]},
-        {"x":14, "y":0, "matrix": [0, 12]},
-
-        {"x":0, "y":1.5, "matrix": [1, 0]},
-        {"x":1, "y":1.5, "matrix": [1, 1]},
-        {"x":2, "y":1.5, "matrix": [1, 2]},
-        {"x":3, "y":1.5, "matrix": [1, 3]},
-        {"x":4, "y":1.5, "matrix": [1, 4]},
-        {"x":5, "y":1.5, "matrix": [1, 5]},
-        {"x":6, "y":1.5, "matrix": [1, 6]},
-        {"x":7, "y":1.5, "matrix": [1, 7]},
-        {"x":8, "y":1.5, "matrix": [1, 8]},
-        {"x":9, "y":1.5, "matrix": [1, 9]},
-        {"x":10, "y":1.5, "matrix": [1, 10]},
-        {"x":11, "y":1.5, "matrix": [1, 11]},
-        {"x":12, "y":1.5, "matrix": [1, 12]},
-        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
-
-        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
-        {"x":1.5, "y":2.5, "matrix": [2, 1]},
-        {"x":2.5, "y":2.5, "matrix": [2, 2]},
-        {"x":3.5, "y":2.5, "matrix": [2, 3]},
-        {"x":4.5, "y":2.5, "matrix": [2, 4]},
-        {"x":5.5, "y":2.5, "matrix": [2, 5]},
-        {"x":6.5, "y":2.5, "matrix": [2, 6]},
-        {"x":7.5, "y":2.5, "matrix": [2, 7]},
-        {"x":8.5, "y":2.5, "matrix": [2, 8]},
-        {"x":9.5, "y":2.5, "matrix": [2, 9]},
-        {"x":10.5, "y":2.5, "matrix": [2, 10]},
-        {"x":11.5, "y":2.5, "matrix": [2, 11]},
-        {"x":12.5, "y":2.5, "matrix": [2, 12]},
-
-        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
-        {"x":1.75, "y":3.5, "matrix": [3, 1]},
-        {"x":2.75, "y":3.5, "matrix": [3, 2]},
-        {"x":3.75, "y":3.5, "matrix": [3, 3]},
-        {"x":4.75, "y":3.5, "matrix": [3, 4]},
-        {"x":5.75, "y":3.5, "matrix": [3, 5]},
-        {"x":6.75, "y":3.5, "matrix": [3, 6]},
-        {"x":7.75, "y":3.5, "matrix": [3, 7]},
-        {"x":8.75, "y":3.5, "matrix": [3, 8]},
-        {"x":9.75, "y":3.5, "matrix": [3, 9]},
-        {"x":10.75, "y":3.5, "matrix": [3, 10]},
-        {"x":11.75, "y":3.5, "matrix": [3, 11]},
-        {"x":12.75, "y":3.5, "matrix": [3, 12]},
-        {"x":13.75, "y":2.5, "w":1.25, "h":2, "matrix": [3, 13]},
-
-        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
-        {"x":1.25, "y":4.5, "matrix": [4, 1]},
-        {"x":2.25, "y":4.5, "matrix": [4, 2]},
-        {"x":3.25, "y":4.5, "matrix": [4, 3]},
-        {"x":4.25, "y":4.5, "matrix": [4, 4]},
-        {"x":5.25, "y":4.5, "matrix": [4, 5]},
-        {"x":6.25, "y":4.5, "matrix": [4, 6]},
-        {"x":7.25, "y":4.5, "matrix": [4, 7]},
-        {"x":8.25, "y":4.5, "matrix": [4, 8]},
-        {"x":9.25, "y":4.5, "matrix": [4, 9]},
-        {"x":10.25, "y":4.5, "matrix": [4, 10]},
-        {"x":11.25, "y":4.5, "matrix": [4, 11]},
-        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
-
-        {"x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
-        {"x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
-        {"x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
-        {"x":3.75, "y":5.5, "w":6.25, "matrix": [5, 7]},
-        {"x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
-        {"x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
-        {"x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
-        {"x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+
+        {"x": 6.5, "y": 0, "matrix": [0, 5]},
+        {"x": 7.5, "y": 0, "matrix": [0, 6]},
+        {"x": 8.5, "y": 0, "matrix": [0, 7]},
+        {"x": 9.5, "y": 0, "matrix": [0, 8]},
+
+        {"x": 11, "y": 0, "matrix": [0, 9]},
+        {"x": 12, "y": 0, "matrix": [0, 10]},
+        {"x": 13, "y": 0, "matrix": [0, 11]},
+        {"x": 14, "y": 0, "matrix": [0, 12]},
+
+        {"x": 0, "y": 1.5, "matrix": [1, 0]},
+        {"x": 1, "y": 1.5, "matrix": [1, 1]},
+        {"x": 2, "y": 1.5, "matrix": [1, 2]},
+        {"x": 3, "y": 1.5, "matrix": [1, 3]},
+        {"x": 4, "y": 1.5, "matrix": [1, 4]},
+        {"x": 5, "y": 1.5, "matrix": [1, 5]},
+        {"x": 6, "y": 1.5, "matrix": [1, 6]},
+        {"x": 7, "y": 1.5, "matrix": [1, 7]},
+        {"x": 8, "y": 1.5, "matrix": [1, 8]},
+        {"x": 9, "y": 1.5, "matrix": [1, 9]},
+        {"x": 10, "y": 1.5, "matrix": [1, 10]},
+        {"x": 11, "y": 1.5, "matrix": [1, 11]},
+        {"x": 12, "y": 1.5, "matrix": [1, 12]},
+        {"x": 13, "y": 1.5, "w": 2, "matrix": [0, 13]},
+
+        {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+        {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+        {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+        {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+        {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+        {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+        {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+        {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+        {"x": 9.5, "y": 2.5, "matrix": [2, 9]},
+        {"x": 10.5, "y": 2.5, "matrix": [2, 10]},
+        {"x": 11.5, "y": 2.5, "matrix": [2, 11]},
+        {"x": 12.5, "y": 2.5, "matrix": [2, 12]},
+
+        {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+        {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+        {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+        {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+        {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+        {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+        {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+        {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+        {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+        {"x": 9.75, "y": 3.5, "matrix": [3, 9]},
+        {"x": 10.75, "y": 3.5, "matrix": [3, 10]},
+        {"x": 11.75, "y": 3.5, "matrix": [3, 11]},
+        {"x": 12.75, "y": 3.5, "matrix": [3, 12]},
+        {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2, "matrix": [3, 13]},
+
+        {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
+        {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
+        {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+        {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+        {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+        {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+        {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+        {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+        {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+        {"x": 9.25, "y": 4.5, "matrix": [4, 9]},
+        {"x": 10.25, "y": 4.5, "matrix": [4, 10]},
+        {"x": 11.25, "y": 4.5, "matrix": [4, 11]},
+        {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [4, 12]},
+
+        {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
+        {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
+        {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
+        {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 7]},
+        {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 10]},
+        {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 11]},
+        {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 12]},
+        {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 13]}
       ]
     },
     "LAYOUT_iso_wkl": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-
-        {"x":2, "y":0, "matrix": [0, 1]},
-        {"x":3, "y":0, "matrix": [0, 2]},
-        {"x":4, "y":0, "matrix": [0, 3]},
-        {"x":5, "y":0, "matrix": [0, 4]},
-
-        {"x":6.5, "y":0, "matrix": [0, 5]},
-        {"x":7.5, "y":0, "matrix": [0, 6]},
-        {"x":8.5, "y":0, "matrix": [0, 7]},
-        {"x":9.5, "y":0, "matrix": [0, 8]},
-
-        {"x":11, "y":0, "matrix": [0, 9]},
-        {"x":12, "y":0, "matrix": [0, 10]},
-        {"x":13, "y":0, "matrix": [0, 11]},
-        {"x":14, "y":0, "matrix": [0, 12]},
-
-        {"x":0, "y":1.5, "matrix": [1, 0]},
-        {"x":1, "y":1.5, "matrix": [1, 1]},
-        {"x":2, "y":1.5, "matrix": [1, 2]},
-        {"x":3, "y":1.5, "matrix": [1, 3]},
-        {"x":4, "y":1.5, "matrix": [1, 4]},
-        {"x":5, "y":1.5, "matrix": [1, 5]},
-        {"x":6, "y":1.5, "matrix": [1, 6]},
-        {"x":7, "y":1.5, "matrix": [1, 7]},
-        {"x":8, "y":1.5, "matrix": [1, 8]},
-        {"x":9, "y":1.5, "matrix": [1, 9]},
-        {"x":10, "y":1.5, "matrix": [1, 10]},
-        {"x":11, "y":1.5, "matrix": [1, 11]},
-        {"x":12, "y":1.5, "matrix": [1, 12]},
-        {"x":13, "y":1.5, "w":2, "matrix": [0, 13]},
-
-        {"x":0, "y":2.5, "w":1.5, "matrix": [2, 0]},
-        {"x":1.5, "y":2.5, "matrix": [2, 1]},
-        {"x":2.5, "y":2.5, "matrix": [2, 2]},
-        {"x":3.5, "y":2.5, "matrix": [2, 3]},
-        {"x":4.5, "y":2.5, "matrix": [2, 4]},
-        {"x":5.5, "y":2.5, "matrix": [2, 5]},
-        {"x":6.5, "y":2.5, "matrix": [2, 6]},
-        {"x":7.5, "y":2.5, "matrix": [2, 7]},
-        {"x":8.5, "y":2.5, "matrix": [2, 8]},
-        {"x":9.5, "y":2.5, "matrix": [2, 9]},
-        {"x":10.5, "y":2.5, "matrix": [2, 10]},
-        {"x":11.5, "y":2.5, "matrix": [2, 11]},
-        {"x":12.5, "y":2.5, "matrix": [2, 12]},
-
-        {"x":0, "y":3.5, "w":1.75, "matrix": [3, 0]},
-        {"x":1.75, "y":3.5, "matrix": [3, 1]},
-        {"x":2.75, "y":3.5, "matrix": [3, 2]},
-        {"x":3.75, "y":3.5, "matrix": [3, 3]},
-        {"x":4.75, "y":3.5, "matrix": [3, 4]},
-        {"x":5.75, "y":3.5, "matrix": [3, 5]},
-        {"x":6.75, "y":3.5, "matrix": [3, 6]},
-        {"x":7.75, "y":3.5, "matrix": [3, 7]},
-        {"x":8.75, "y":3.5, "matrix": [3, 8]},
-        {"x":9.75, "y":3.5, "matrix": [3, 9]},
-        {"x":10.75, "y":3.5, "matrix": [3, 10]},
-        {"x":11.75, "y":3.5, "matrix": [3, 11]},
-        {"x":12.75, "y":3.5, "matrix": [3, 12]},
-        {"x":13.75, "y":2.5, "w":1.25, "h":2, "matrix": [3, 13]},
-
-        {"x":0, "y":4.5, "w":1.25, "matrix": [4, 0]},
-        {"x":1.25, "y":4.5, "matrix": [4, 1]},
-        {"x":2.25, "y":4.5, "matrix": [4, 2]},
-        {"x":3.25, "y":4.5, "matrix": [4, 3]},
-        {"x":4.25, "y":4.5, "matrix": [4, 4]},
-        {"x":5.25, "y":4.5, "matrix": [4, 5]},
-        {"x":6.25, "y":4.5, "matrix": [4, 6]},
-        {"x":7.25, "y":4.5, "matrix": [4, 7]},
-        {"x":8.25, "y":4.5, "matrix": [4, 8]},
-        {"x":9.25, "y":4.5, "matrix": [4, 9]},
-        {"x":10.25, "y":4.5, "matrix": [4, 10]},
-        {"x":11.25, "y":4.5, "matrix": [4, 11]},
-        {"x":12.25, "y":4.5, "w":2.75, "matrix": [4, 12]},
-
-        {"x":0, "y":5.5, "w":1.5, "matrix": [5, 0]},
-        {"x":2.5, "y":5.5, "w":1.5, "matrix": [5, 2]},
-        {"x":4, "y":5.5, "w":7, "matrix": [5, 7]},
-        {"x":11, "y":5.5, "w":1.5, "matrix": [5, 11]},
-        {"x":13.5, "y":5.5, "w":1.5, "matrix": [5, 13]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+
+        {"x": 2, "y": 0, "matrix": [0, 1]},
+        {"x": 3, "y": 0, "matrix": [0, 2]},
+        {"x": 4, "y": 0, "matrix": [0, 3]},
+        {"x": 5, "y": 0, "matrix": [0, 4]},
+
+        {"x": 6.5, "y": 0, "matrix": [0, 5]},
+        {"x": 7.5, "y": 0, "matrix": [0, 6]},
+        {"x": 8.5, "y": 0, "matrix": [0, 7]},
+        {"x": 9.5, "y": 0, "matrix": [0, 8]},
+
+        {"x": 11, "y": 0, "matrix": [0, 9]},
+        {"x": 12, "y": 0, "matrix": [0, 10]},
+        {"x": 13, "y": 0, "matrix": [0, 11]},
+        {"x": 14, "y": 0, "matrix": [0, 12]},
+
+        {"x": 0, "y": 1.5, "matrix": [1, 0]},
+        {"x": 1, "y": 1.5, "matrix": [1, 1]},
+        {"x": 2, "y": 1.5, "matrix": [1, 2]},
+        {"x": 3, "y": 1.5, "matrix": [1, 3]},
+        {"x": 4, "y": 1.5, "matrix": [1, 4]},
+        {"x": 5, "y": 1.5, "matrix": [1, 5]},
+        {"x": 6, "y": 1.5, "matrix": [1, 6]},
+        {"x": 7, "y": 1.5, "matrix": [1, 7]},
+        {"x": 8, "y": 1.5, "matrix": [1, 8]},
+        {"x": 9, "y": 1.5, "matrix": [1, 9]},
+        {"x": 10, "y": 1.5, "matrix": [1, 10]},
+        {"x": 11, "y": 1.5, "matrix": [1, 11]},
+        {"x": 12, "y": 1.5, "matrix": [1, 12]},
+        {"x": 13, "y": 1.5, "w": 2, "matrix": [0, 13]},
+
+        {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]},
+        {"x": 1.5, "y": 2.5, "matrix": [2, 1]},
+        {"x": 2.5, "y": 2.5, "matrix": [2, 2]},
+        {"x": 3.5, "y": 2.5, "matrix": [2, 3]},
+        {"x": 4.5, "y": 2.5, "matrix": [2, 4]},
+        {"x": 5.5, "y": 2.5, "matrix": [2, 5]},
+        {"x": 6.5, "y": 2.5, "matrix": [2, 6]},
+        {"x": 7.5, "y": 2.5, "matrix": [2, 7]},
+        {"x": 8.5, "y": 2.5, "matrix": [2, 8]},
+        {"x": 9.5, "y": 2.5, "matrix": [2, 9]},
+        {"x": 10.5, "y": 2.5, "matrix": [2, 10]},
+        {"x": 11.5, "y": 2.5, "matrix": [2, 11]},
+        {"x": 12.5, "y": 2.5, "matrix": [2, 12]},
+
+        {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]},
+        {"x": 1.75, "y": 3.5, "matrix": [3, 1]},
+        {"x": 2.75, "y": 3.5, "matrix": [3, 2]},
+        {"x": 3.75, "y": 3.5, "matrix": [3, 3]},
+        {"x": 4.75, "y": 3.5, "matrix": [3, 4]},
+        {"x": 5.75, "y": 3.5, "matrix": [3, 5]},
+        {"x": 6.75, "y": 3.5, "matrix": [3, 6]},
+        {"x": 7.75, "y": 3.5, "matrix": [3, 7]},
+        {"x": 8.75, "y": 3.5, "matrix": [3, 8]},
+        {"x": 9.75, "y": 3.5, "matrix": [3, 9]},
+        {"x": 10.75, "y": 3.5, "matrix": [3, 10]},
+        {"x": 11.75, "y": 3.5, "matrix": [3, 11]},
+        {"x": 12.75, "y": 3.5, "matrix": [3, 12]},
+        {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2, "matrix": [3, 13]},
+
+        {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]},
+        {"x": 1.25, "y": 4.5, "matrix": [4, 1]},
+        {"x": 2.25, "y": 4.5, "matrix": [4, 2]},
+        {"x": 3.25, "y": 4.5, "matrix": [4, 3]},
+        {"x": 4.25, "y": 4.5, "matrix": [4, 4]},
+        {"x": 5.25, "y": 4.5, "matrix": [4, 5]},
+        {"x": 6.25, "y": 4.5, "matrix": [4, 6]},
+        {"x": 7.25, "y": 4.5, "matrix": [4, 7]},
+        {"x": 8.25, "y": 4.5, "matrix": [4, 8]},
+        {"x": 9.25, "y": 4.5, "matrix": [4, 9]},
+        {"x": 10.25, "y": 4.5, "matrix": [4, 10]},
+        {"x": 11.25, "y": 4.5, "matrix": [4, 11]},
+        {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [4, 12]},
+
+        {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]},
+        {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]},
+        {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 7]},
+        {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 11]},
+        {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 13]}
       ]
     }
   }
diff --git a/keyboards/tominabox1/bigboy/info.json b/keyboards/tominabox1/bigboy/info.json
index 5d954777ba..87f8473bb8 100644
--- a/keyboards/tominabox1/bigboy/info.json
+++ b/keyboards/tominabox1/bigboy/info.json
@@ -27,19 +27,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]}
             ]
         },
         "LAYOUT_2us": {
             "layout": [
-                {"x":0, "y":0, "h":2, "matrix": [0, 0]},
-                {"x":1, "y":0, "h":2, "matrix": [0, 1]},
-                {"x":2, "y":0, "h":2, "matrix": [0, 2]}
+                {"x": 0, "y": 0, "h": 2, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "h": 2, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "h": 2, "matrix": [0, 2]}
             ]
         }
     }
diff --git a/keyboards/ungodly/nines/info.json b/keyboards/ungodly/nines/info.json
index 23ffafcad1..8c2ab4c249 100644
--- a/keyboards/ungodly/nines/info.json
+++ b/keyboards/ungodly/nines/info.json
@@ -26,15 +26,15 @@
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]},
-        {"x":2, "y":0, "matrix": [0, 2]},
-        {"x":0, "y":1, "matrix": [1, 0]},
-        {"x":1, "y":1, "matrix": [1, 1]},
-        {"x":2, "y":1, "matrix": [1, 2]},
-        {"x":0, "y":2, "matrix": [2, 0]},
-        {"x":1, "y":2, "matrix": [2, 1]},
-        {"x":2, "y":2, "matrix": [2, 2]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]},
+        {"x": 2, "y": 0, "matrix": [0, 2]},
+        {"x": 0, "y": 1, "matrix": [1, 0]},
+        {"x": 1, "y": 1, "matrix": [1, 1]},
+        {"x": 2, "y": 1, "matrix": [1, 2]},
+        {"x": 0, "y": 2, "matrix": [2, 0]},
+        {"x": 1, "y": 2, "matrix": [2, 1]},
+        {"x": 2, "y": 2, "matrix": [2, 2]}
       ]
     }
   }
diff --git a/keyboards/unicomp/classic_ultracl_post_2013/info.json b/keyboards/unicomp/classic_ultracl_post_2013/info.json
index 693250310d..f92299e9fa 100644
--- a/keyboards/unicomp/classic_ultracl_post_2013/info.json
+++ b/keyboards/unicomp/classic_ultracl_post_2013/info.json
@@ -10,2626 +10,335 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 4.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5},
+                {"matrix": [1, 8], "x": 14, "y": 1.5},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 4], "x": 4, "y": 5.5},
+                {"matrix": [7, 13], "x": 5, "y": 5.5, "w": 4.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 14], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5, "h": 2},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/unicomp/pc122/info.json b/keyboards/unicomp/pc122/info.json
index 0c580e729f..162495c25b 100644
--- a/keyboards/unicomp/pc122/info.json
+++ b/keyboards/unicomp/pc122/info.json
@@ -10,1990 +10,254 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 10.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 11.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 12.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 13.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        13
-                    ],
-                    "x": 14.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 4.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 5.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 6.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 7.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 1,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 3.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 4.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 7.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 9.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 10.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 11.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 12.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 13.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 14.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 17.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 18.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 19.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 21.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 22.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 23.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 24.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 0,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 3.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 13.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 14.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 15.75,
-                    "y": 3.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 17.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 18.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 19.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 24.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 2.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 4,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 6,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 7,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 8,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 9,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 10,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 12,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 13,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 14,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 15,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 16,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 18.75,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 24.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 0,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 1,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 2.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 3.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 4.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 5.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 6.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 7.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 8.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 9.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 10.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 13.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 14.5,
-                    "y": 5.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 17.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        13
-                    ],
-                    "x": 18.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 19.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 24.25,
-                    "y": 5.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 0,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 1,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2.25,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 4.75,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 6.25,
-                    "y": 6.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 13.25,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 15.75,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 18.75,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.25,
-                    "y": 6.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 6.5
-                }
+                {"matrix": [3, 14], "x": 3.25, "y": 0},
+                {"matrix": [1, 14], "x": 4.25, "y": 0},
+                {"matrix": [4, 14], "x": 5.25, "y": 0},
+                {"matrix": [2, 15], "x": 6.25, "y": 0},
+                {"matrix": [2, 4], "x": 7.25, "y": 0},
+                {"matrix": [7, 1], "x": 8.25, "y": 0},
+                {"matrix": [2, 1], "x": 9.25, "y": 0},
+                {"matrix": [4, 13], "x": 10.25, "y": 0},
+                {"matrix": [1, 1], "x": 11.25, "y": 0},
+                {"matrix": [1, 4], "x": 12.25, "y": 0},
+                {"matrix": [1, 13], "x": 13.25, "y": 0},
+                {"matrix": [3, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 1},
+                {"matrix": [7, 3], "x": 4.25, "y": 1},
+                {"matrix": [0, 2], "x": 5.25, "y": 1},
+                {"matrix": [7, 4], "x": 6.25, "y": 1},
+                {"matrix": [0, 8], "x": 7.25, "y": 1},
+                {"matrix": [7, 8], "x": 8.25, "y": 1},
+                {"matrix": [0, 9], "x": 9.25, "y": 1},
+                {"matrix": [7, 9], "x": 10.25, "y": 1},
+                {"matrix": [0, 10], "x": 11.25, "y": 1},
+                {"matrix": [7, 10], "x": 12.25, "y": 1},
+                {"matrix": [0, 11], "x": 13.25, "y": 1},
+                {"matrix": [7, 11], "x": 14.25, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 2.5},
+                {"matrix": [0, 14], "x": 1, "y": 2.5},
+                {"matrix": [7, 0], "x": 2.25, "y": 2.5},
+                {"matrix": [2, 0], "x": 3.25, "y": 2.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 2.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 2.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 2.5},
+                {"matrix": [7, 6], "x": 7.25, "y": 2.5},
+                {"matrix": [0, 7], "x": 8.25, "y": 2.5},
+                {"matrix": [7, 7], "x": 9.25, "y": 2.5},
+                {"matrix": [7, 5], "x": 10.25, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.5},
+                {"matrix": [1, 9], "x": 13.25, "y": 2.5},
+                {"matrix": [2, 8], "x": 14.25, "y": 2.5},
+                {"matrix": [1, 8], "x": 15.25, "y": 2.5, "w": 2},
+                {"matrix": [0, 4], "x": 17.75, "y": 2.5},
+                {"matrix": [1, 12], "x": 18.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 19.75, "y": 2.5},
+                {"matrix": [2, 2], "x": 21.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 22.25, "y": 2.5},
+                {"matrix": [2, 11], "x": 23.25, "y": 2.5},
+                {"matrix": [7, 2], "x": 24.25, "y": 2.5},
+                {"matrix": [0, 12], "x": 0, "y": 3.5},
+                {"matrix": [0, 1], "x": 1, "y": 3.5},
+                {"matrix": [1, 0], "x": 2.25, "y": 3.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.5},
+                {"matrix": [1, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [2, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [2, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 9], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 14.75, "y": 3.5},
+                {"matrix": [4, 8], "x": 15.75, "y": 3.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 17.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 18.75, "y": 3.5},
+                {"matrix": [1, 3], "x": 19.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 21.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 22.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 23.25, "y": 3.5},
+                {"matrix": [6, 12], "x": 24.25, "y": 3.5},
+                {"matrix": [7, 15], "x": 0, "y": 4.5},
+                {"matrix": [0, 15], "x": 1, "y": 4.5},
+                {"matrix": [1, 15], "x": 2.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 4, "y": 4.5},
+                {"matrix": [6, 3], "x": 5, "y": 4.5},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [3, 6], "x": 7, "y": 4.5},
+                {"matrix": [4, 6], "x": 8, "y": 4.5},
+                {"matrix": [3, 7], "x": 9, "y": 4.5},
+                {"matrix": [4, 7], "x": 10, "y": 4.5},
+                {"matrix": [3, 5], "x": 11, "y": 4.5},
+                {"matrix": [6, 9], "x": 12, "y": 4.5},
+                {"matrix": [3, 10], "x": 13, "y": 4.5},
+                {"matrix": [4, 10], "x": 14, "y": 4.5},
+                {"matrix": [6, 13], "x": 15, "y": 4.5},
+                {"matrix": [5, 8], "x": 16, "y": 4.5, "w": 1.25},
+                {"matrix": [2, 13], "x": 18.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 21.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 22.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 23.25, "y": 4.5},
+                {"matrix": [5, 14], "x": 24.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 0, "y": 5.5},
+                {"matrix": [7, 12], "x": 1, "y": 5.5},
+                {"matrix": [5, 1], "x": 2.25, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 3.5, "y": 5.5},
+                {"matrix": [5, 0], "x": 4.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 5.5, "y": 5.5},
+                {"matrix": [6, 5], "x": 6.5, "y": 5.5},
+                {"matrix": [6, 6], "x": 7.5, "y": 5.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 5.5},
+                {"matrix": [6, 7], "x": 9.5, "y": 5.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 5.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 5.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [6, 10], "x": 13.5, "y": 5.5},
+                {"matrix": [3, 1], "x": 14.5, "y": 5.5, "w": 2.75},
+                {"matrix": [6, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.75, "y": 5.5},
+                {"matrix": [0, 13], "x": 19.75, "y": 5.5},
+                {"matrix": [5, 12], "x": 21.25, "y": 5.5},
+                {"matrix": [6, 11], "x": 22.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 23.25, "y": 5.5},
+                {"matrix": [7, 14], "x": 24.25, "y": 5.5, "h": 2},
+                {"matrix": [2, 14], "x": 0, "y": 6.5},
+                {"matrix": [4, 15], "x": 1, "y": 6.5},
+                {"matrix": [3, 15], "x": 2.25, "y": 6.5, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 6.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 6.25, "y": 6.5, "w": 7},
+                {"matrix": [6, 4], "x": 13.25, "y": 6.5, "w": 1.5},
+                {"matrix": [5, 15], "x": 15.75, "y": 6.5, "w": 1.5},
+                {"matrix": [1, 10], "x": 18.75, "y": 6.5},
+                {"matrix": [5, 11], "x": 21.25, "y": 6.5, "w": 2},
+                {"matrix": [5, 2], "x": 23.25, "y": 6.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        3,
-                        14
-                    ],
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        14
-                    ],
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        15
-                    ],
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 7.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        1
-                    ],
-                    "x": 8.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 9.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 10.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        1
-                    ],
-                    "x": 11.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        4
-                    ],
-                    "x": 12.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 13.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        3,
-                        13
-                    ],
-                    "x": 14.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 4.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 5.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 6.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 7.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 8.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 9.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14.25,
-                    "y": 1
-                },
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 1,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 3.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 4.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 5.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 7.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 9.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 10.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 11.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 12.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 13.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 14.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 2.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 17.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 18.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 19.75,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 21.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 22.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 23.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 24.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 0,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 1,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 3.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 13.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 14.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 15.75,
-                    "y": 3.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 17.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 18.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 19.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 24.25,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        15
-                    ],
-                    "x": 1,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 2.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 4,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 6,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 7,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 8,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 9,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 10,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 11,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 12,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 13,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 14,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 15,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 18.75,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 24.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 0,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 1,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 2.25,
-                    "y": 5.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 4.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 5.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 6.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 7.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 8.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 9.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 10.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 11.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 13.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 14.5,
-                    "y": 5.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 17.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        13
-                    ],
-                    "x": 18.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 19.75,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 21.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 22.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 24.25,
-                    "y": 5.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 0,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        15
-                    ],
-                    "x": 1,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 2.25,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 4.75,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 6.25,
-                    "y": 6.5,
-                    "w": 7
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 13.25,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 15.75,
-                    "y": 6.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 18.75,
-                    "y": 6.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 21.25,
-                    "y": 6.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 23.25,
-                    "y": 6.5
-                }
+                {"matrix": [3, 14], "x": 3.25, "y": 0},
+                {"matrix": [1, 14], "x": 4.25, "y": 0},
+                {"matrix": [4, 14], "x": 5.25, "y": 0},
+                {"matrix": [2, 15], "x": 6.25, "y": 0},
+                {"matrix": [2, 4], "x": 7.25, "y": 0},
+                {"matrix": [7, 1], "x": 8.25, "y": 0},
+                {"matrix": [2, 1], "x": 9.25, "y": 0},
+                {"matrix": [4, 13], "x": 10.25, "y": 0},
+                {"matrix": [1, 1], "x": 11.25, "y": 0},
+                {"matrix": [1, 4], "x": 12.25, "y": 0},
+                {"matrix": [1, 13], "x": 13.25, "y": 0},
+                {"matrix": [3, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 1},
+                {"matrix": [7, 3], "x": 4.25, "y": 1},
+                {"matrix": [0, 2], "x": 5.25, "y": 1},
+                {"matrix": [7, 4], "x": 6.25, "y": 1},
+                {"matrix": [0, 8], "x": 7.25, "y": 1},
+                {"matrix": [7, 8], "x": 8.25, "y": 1},
+                {"matrix": [0, 9], "x": 9.25, "y": 1},
+                {"matrix": [7, 9], "x": 10.25, "y": 1},
+                {"matrix": [0, 10], "x": 11.25, "y": 1},
+                {"matrix": [7, 10], "x": 12.25, "y": 1},
+                {"matrix": [0, 11], "x": 13.25, "y": 1},
+                {"matrix": [7, 11], "x": 14.25, "y": 1},
+                {"matrix": [0, 0], "x": 0, "y": 2.5},
+                {"matrix": [0, 14], "x": 1, "y": 2.5},
+                {"matrix": [7, 0], "x": 2.25, "y": 2.5},
+                {"matrix": [2, 0], "x": 3.25, "y": 2.5},
+                {"matrix": [3, 3], "x": 4.25, "y": 2.5},
+                {"matrix": [0, 5], "x": 5.25, "y": 2.5},
+                {"matrix": [0, 6], "x": 6.25, "y": 2.5},
+                {"matrix": [7, 6], "x": 7.25, "y": 2.5},
+                {"matrix": [0, 7], "x": 8.25, "y": 2.5},
+                {"matrix": [7, 7], "x": 9.25, "y": 2.5},
+                {"matrix": [7, 5], "x": 10.25, "y": 2.5},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.5},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.5},
+                {"matrix": [1, 9], "x": 13.25, "y": 2.5},
+                {"matrix": [2, 8], "x": 14.25, "y": 2.5},
+                {"matrix": [1, 8], "x": 15.25, "y": 2.5, "w": 2},
+                {"matrix": [0, 4], "x": 17.75, "y": 2.5},
+                {"matrix": [1, 12], "x": 18.75, "y": 2.5},
+                {"matrix": [2, 3], "x": 19.75, "y": 2.5},
+                {"matrix": [2, 2], "x": 21.25, "y": 2.5},
+                {"matrix": [2, 12], "x": 22.25, "y": 2.5},
+                {"matrix": [2, 11], "x": 23.25, "y": 2.5},
+                {"matrix": [7, 2], "x": 24.25, "y": 2.5},
+                {"matrix": [0, 12], "x": 0, "y": 3.5},
+                {"matrix": [0, 1], "x": 1, "y": 3.5},
+                {"matrix": [1, 0], "x": 2.25, "y": 3.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 3.75, "y": 3.5},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.5},
+                {"matrix": [1, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [2, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [1, 6], "x": 7.75, "y": 3.5},
+                {"matrix": [2, 7], "x": 8.75, "y": 3.5},
+                {"matrix": [1, 7], "x": 9.75, "y": 3.5},
+                {"matrix": [2, 5], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 10], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 9], "x": 13.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 14.75, "y": 3.5},
+                {"matrix": [4, 8], "x": 15.75, "y": 3.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 17.75, "y": 3.5},
+                {"matrix": [1, 11], "x": 18.75, "y": 3.5},
+                {"matrix": [1, 3], "x": 19.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 21.25, "y": 3.5},
+                {"matrix": [3, 11], "x": 22.25, "y": 3.5},
+                {"matrix": [3, 2], "x": 23.25, "y": 3.5},
+                {"matrix": [6, 12], "x": 24.25, "y": 3.5},
+                {"matrix": [7, 15], "x": 0, "y": 4.5},
+                {"matrix": [0, 15], "x": 1, "y": 4.5},
+                {"matrix": [1, 15], "x": 2.25, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 4, "y": 4.5},
+                {"matrix": [6, 3], "x": 5, "y": 4.5},
+                {"matrix": [4, 5], "x": 6, "y": 4.5},
+                {"matrix": [3, 6], "x": 7, "y": 4.5},
+                {"matrix": [4, 6], "x": 8, "y": 4.5},
+                {"matrix": [3, 7], "x": 9, "y": 4.5},
+                {"matrix": [4, 7], "x": 10, "y": 4.5},
+                {"matrix": [3, 5], "x": 11, "y": 4.5},
+                {"matrix": [6, 9], "x": 12, "y": 4.5},
+                {"matrix": [3, 10], "x": 13, "y": 4.5},
+                {"matrix": [4, 10], "x": 14, "y": 4.5},
+                {"matrix": [5, 8], "x": 15, "y": 4.5, "w": 2.25},
+                {"matrix": [2, 13], "x": 18.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 21.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 22.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 23.25, "y": 4.5},
+                {"matrix": [5, 14], "x": 24.25, "y": 4.5},
+                {"matrix": [6, 14], "x": 0, "y": 5.5},
+                {"matrix": [7, 12], "x": 1, "y": 5.5},
+                {"matrix": [5, 1], "x": 2.25, "y": 5.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 4.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 5.5, "y": 5.5},
+                {"matrix": [6, 5], "x": 6.5, "y": 5.5},
+                {"matrix": [6, 6], "x": 7.5, "y": 5.5},
+                {"matrix": [5, 6], "x": 8.5, "y": 5.5},
+                {"matrix": [6, 7], "x": 9.5, "y": 5.5},
+                {"matrix": [5, 7], "x": 10.5, "y": 5.5},
+                {"matrix": [5, 5], "x": 11.5, "y": 5.5},
+                {"matrix": [5, 9], "x": 12.5, "y": 5.5},
+                {"matrix": [6, 10], "x": 13.5, "y": 5.5},
+                {"matrix": [3, 1], "x": 14.5, "y": 5.5, "w": 2.75},
+                {"matrix": [6, 8], "x": 17.75, "y": 5.5},
+                {"matrix": [5, 13], "x": 18.75, "y": 5.5},
+                {"matrix": [0, 13], "x": 19.75, "y": 5.5},
+                {"matrix": [5, 12], "x": 21.25, "y": 5.5},
+                {"matrix": [6, 11], "x": 22.25, "y": 5.5},
+                {"matrix": [6, 2], "x": 23.25, "y": 5.5},
+                {"matrix": [7, 14], "x": 24.25, "y": 5.5, "h": 2},
+                {"matrix": [2, 14], "x": 0, "y": 6.5},
+                {"matrix": [4, 15], "x": 1, "y": 6.5},
+                {"matrix": [3, 15], "x": 2.25, "y": 6.5, "w": 1.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 6.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 6.25, "y": 6.5, "w": 7},
+                {"matrix": [6, 4], "x": 13.25, "y": 6.5, "w": 1.5},
+                {"matrix": [5, 15], "x": 15.75, "y": 6.5, "w": 1.5},
+                {"matrix": [1, 10], "x": 18.75, "y": 6.5},
+                {"matrix": [5, 11], "x": 21.25, "y": 6.5, "w": 2},
+                {"matrix": [5, 2], "x": 23.25, "y": 6.5}
             ]
         }
     }
diff --git a/keyboards/unicomp/spacesaver_m_post_2013/info.json b/keyboards/unicomp/spacesaver_m_post_2013/info.json
index fc91057391..52eb4d8036 100644
--- a/keyboards/unicomp/spacesaver_m_post_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_post_2013/info.json
@@ -10,2640 +10,337 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 4.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5},
+                {"matrix": [1, 8], "x": 14, "y": 1.5},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 4], "x": 4, "y": 5.5},
+                {"matrix": [7, 13], "x": 5, "y": 5.5, "w": 4.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 14], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [1, 13], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [7, 12], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/info.json b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
index 57ac811dd9..166baaca41 100644
--- a/keyboards/unicomp/spacesaver_m_pre_2013/info.json
+++ b/keyboards/unicomp/spacesaver_m_pre_2013/info.json
@@ -10,2646 +10,337 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        1
-                    ],
-                    "x": 13,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 14,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 3.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        13
-                    ],
-                    "x": 12.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 13.25,
-                    "y": 4.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        2,
-                        4
-                    ],
-                    "x": 4,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 5,
-                    "y": 5.5,
-                    "w": 4.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        14
-                    ],
-                    "x": 18.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [2, 1], "x": 13, "y": 1.5},
+                {"matrix": [1, 8], "x": 14, "y": 1.5},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 3.5, "w": 1.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 12.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 13.25, "y": 4.5, "w": 1.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [2, 4], "x": 4, "y": 5.5},
+                {"matrix": [7, 13], "x": 5, "y": 5.5, "w": 4.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 11], "x": 19.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5},
+                {"matrix": [6, 14], "x": 21.5, "y": 5.5}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        8
-                    ],
-                    "x": 13.5,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 12.75,
-                    "y": 3.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 2.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [4, 8], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [5, 8], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "matrix": [
-                        0,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        3
-                    ],
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        2
-                    ],
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        4
-                    ],
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        8
-                    ],
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        8
-                    ],
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        9
-                    ],
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        10
-                    ],
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        10
-                    ],
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        11
-                    ],
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        11
-                    ],
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        12
-                    ],
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        14
-                    ],
-                    "x": 16.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        0,
-                        1
-                    ],
-                    "x": 17.25,
-                    "y": 0
-                },
-                {
-                    "matrix": [
-                        7,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        0
-                    ],
-                    "x": 1,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        3
-                    ],
-                    "x": 2,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        5
-                    ],
-                    "x": 3,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        6
-                    ],
-                    "x": 4,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        6
-                    ],
-                    "x": 5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        7
-                    ],
-                    "x": 6,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        7
-                    ],
-                    "x": 7,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        5
-                    ],
-                    "x": 8,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        9
-                    ],
-                    "x": 9,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        10
-                    ],
-                    "x": 10,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        9
-                    ],
-                    "x": 11,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        8
-                    ],
-                    "x": 12,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        8
-                    ],
-                    "x": 13,
-                    "y": 1.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        0,
-                        4
-                    ],
-                    "x": 15.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        12
-                    ],
-                    "x": 16.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        2
-                    ],
-                    "x": 18.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        12
-                    ],
-                    "x": 19.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        11
-                    ],
-                    "x": 20.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        2
-                    ],
-                    "x": 21.5,
-                    "y": 1.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        0
-                    ],
-                    "x": 0,
-                    "y": 2.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        0
-                    ],
-                    "x": 1.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        3
-                    ],
-                    "x": 2.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        5
-                    ],
-                    "x": 3.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        6
-                    ],
-                    "x": 4.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        6
-                    ],
-                    "x": 5.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        7
-                    ],
-                    "x": 6.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        7
-                    ],
-                    "x": 7.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        5
-                    ],
-                    "x": 8.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        9
-                    ],
-                    "x": 9.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        10
-                    ],
-                    "x": 10.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        9
-                    ],
-                    "x": 11.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        8
-                    ],
-                    "x": 12.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        8
-                    ],
-                    "x": 13.75,
-                    "y": 2.5,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        1,
-                        2
-                    ],
-                    "x": 15.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        11
-                    ],
-                    "x": 16.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        3
-                    ],
-                    "x": 17.25,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        12
-                    ],
-                    "x": 21.5,
-                    "y": 2.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 3.5,
-                    "w": 1.75
-                },
-                {
-                    "matrix": [
-                        4,
-                        0
-                    ],
-                    "x": 1.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        3
-                    ],
-                    "x": 2.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        5
-                    ],
-                    "x": 3.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        6
-                    ],
-                    "x": 4.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        6
-                    ],
-                    "x": 5.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        7
-                    ],
-                    "x": 6.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        7
-                    ],
-                    "x": 7.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        5
-                    ],
-                    "x": 8.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        9
-                    ],
-                    "x": 9.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        10
-                    ],
-                    "x": 10.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        10
-                    ],
-                    "x": 11.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        13
-                    ],
-                    "x": 12.75,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        4,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 3.5
-                },
-                {
-                    "matrix": [
-                        3,
-                        1
-                    ],
-                    "x": 0,
-                    "y": 4.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        6,
-                        0
-                    ],
-                    "x": 1.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        0
-                    ],
-                    "x": 2.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        3
-                    ],
-                    "x": 3.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        5
-                    ],
-                    "x": 4.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        6
-                    ],
-                    "x": 5.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        6
-                    ],
-                    "x": 6.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        7
-                    ],
-                    "x": 7.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        7
-                    ],
-                    "x": 8.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        5
-                    ],
-                    "x": 9.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        9
-                    ],
-                    "x": 10.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        10
-                    ],
-                    "x": 11.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        1
-                    ],
-                    "x": 12.25,
-                    "y": 4.5,
-                    "w": 2.75
-                },
-                {
-                    "matrix": [
-                        2,
-                        13
-                    ],
-                    "x": 16.25,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        12
-                    ],
-                    "x": 18.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        11
-                    ],
-                    "x": 19.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 4.5
-                },
-                {
-                    "matrix": [
-                        7,
-                        14
-                    ],
-                    "x": 21.5,
-                    "y": 4.5,
-                    "h": 2
-                },
-                {
-                    "matrix": [
-                        3,
-                        15
-                    ],
-                    "x": 0,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        2,
-                        14
-                    ],
-                    "x": 1.5,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        4,
-                        4
-                    ],
-                    "x": 2.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        13
-                    ],
-                    "x": 4,
-                    "y": 5.5,
-                    "w": 5.75
-                },
-                {
-                    "matrix": [
-                        6,
-                        4
-                    ],
-                    "x": 9.75,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        1,
-                        13
-                    ],
-                    "x": 11,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        7,
-                        12
-                    ],
-                    "x": 12.25,
-                    "y": 5.5,
-                    "w": 1.25
-                },
-                {
-                    "matrix": [
-                        5,
-                        15
-                    ],
-                    "x": 13.5,
-                    "y": 5.5,
-                    "w": 1.5
-                },
-                {
-                    "matrix": [
-                        6,
-                        8
-                    ],
-                    "x": 15.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        1,
-                        10
-                    ],
-                    "x": 16.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        0,
-                        13
-                    ],
-                    "x": 17.25,
-                    "y": 5.5
-                },
-                {
-                    "matrix": [
-                        5,
-                        11
-                    ],
-                    "x": 18.5,
-                    "y": 5.5,
-                    "w": 2
-                },
-                {
-                    "matrix": [
-                        5,
-                        2
-                    ],
-                    "x": 20.5,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [7, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [7, 4], "x": 5, "y": 0},
+                {"matrix": [0, 8], "x": 6.5, "y": 0},
+                {"matrix": [7, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [7, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [7, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [7, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 1], "x": 17.25, "y": 0},
+                {"matrix": [7, 0], "x": 0, "y": 1.5},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 3], "x": 2, "y": 1.5},
+                {"matrix": [0, 5], "x": 3, "y": 1.5},
+                {"matrix": [0, 6], "x": 4, "y": 1.5},
+                {"matrix": [7, 6], "x": 5, "y": 1.5},
+                {"matrix": [0, 7], "x": 6, "y": 1.5},
+                {"matrix": [7, 7], "x": 7, "y": 1.5},
+                {"matrix": [7, 5], "x": 8, "y": 1.5},
+                {"matrix": [2, 9], "x": 9, "y": 1.5},
+                {"matrix": [2, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 9], "x": 11, "y": 1.5},
+                {"matrix": [2, 8], "x": 12, "y": 1.5},
+                {"matrix": [1, 8], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [0, 4], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 12], "x": 16.25, "y": 1.5},
+                {"matrix": [2, 3], "x": 17.25, "y": 1.5},
+                {"matrix": [2, 2], "x": 18.5, "y": 1.5},
+                {"matrix": [2, 12], "x": 19.5, "y": 1.5},
+                {"matrix": [2, 11], "x": 20.5, "y": 1.5},
+                {"matrix": [7, 2], "x": 21.5, "y": 1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 2.5},
+                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 4.5, "y": 2.5},
+                {"matrix": [1, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 6.5, "y": 2.5},
+                {"matrix": [1, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 8.5, "y": 2.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [4, 9], "x": 11.5, "y": 2.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 2.5},
+                {"matrix": [5, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+                {"matrix": [1, 2], "x": 15.25, "y": 2.5},
+                {"matrix": [1, 11], "x": 16.25, "y": 2.5},
+                {"matrix": [1, 3], "x": 17.25, "y": 2.5},
+                {"matrix": [3, 12], "x": 18.5, "y": 2.5},
+                {"matrix": [3, 11], "x": 19.5, "y": 2.5},
+                {"matrix": [3, 2], "x": 20.5, "y": 2.5},
+                {"matrix": [6, 12], "x": 21.5, "y": 2.5},
+                {"matrix": [1, 15], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [4, 0], "x": 1.75, "y": 3.5},
+                {"matrix": [6, 3], "x": 2.75, "y": 3.5},
+                {"matrix": [4, 5], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 4.75, "y": 3.5},
+                {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 6.75, "y": 3.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 8.75, "y": 3.5},
+                {"matrix": [6, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [4, 10], "x": 11.75, "y": 3.5},
+                {"matrix": [6, 13], "x": 12.75, "y": 3.5},
+                {"matrix": [4, 12], "x": 18.5, "y": 3.5},
+                {"matrix": [4, 11], "x": 19.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 20.5, "y": 3.5},
+                {"matrix": [4, 14], "x": 21.5, "y": 3.5},
+                {"matrix": [3, 1], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [6, 0], "x": 1.25, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [6, 5], "x": 4.25, "y": 4.5},
+                {"matrix": [6, 6], "x": 5.25, "y": 4.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [6, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [5, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [5, 5], "x": 9.25, "y": 4.5},
+                {"matrix": [5, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [6, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 1], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [2, 13], "x": 16.25, "y": 4.5},
+                {"matrix": [5, 12], "x": 18.5, "y": 4.5},
+                {"matrix": [6, 11], "x": 19.5, "y": 4.5},
+                {"matrix": [6, 2], "x": 20.5, "y": 4.5},
+                {"matrix": [7, 14], "x": 21.5, "y": 4.5, "h": 2},
+                {"matrix": [3, 15], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 1.5, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.75, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 13], "x": 4, "y": 5.5, "w": 5.75},
+                {"matrix": [6, 4], "x": 9.75, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 13], "x": 11, "y": 5.5, "w": 1.25},
+                {"matrix": [7, 12], "x": 12.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 15], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [6, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [1, 10], "x": 16.25, "y": 5.5},
+                {"matrix": [0, 13], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 2], "x": 20.5, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
index 614d534fd2..5ded902883 100644
--- a/keyboards/winkeys/mini_winni/info.json
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -21,14 +21,14 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":3, "y":1, "matrix": [1, 3]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1, "matrix": [1, 3]}
             ]
         }
     }
diff --git a/keyboards/wolf/frogpad/info.json b/keyboards/wolf/frogpad/info.json
index 1e64c40abb..061b9221a7 100644
--- a/keyboards/wolf/frogpad/info.json
+++ b/keyboards/wolf/frogpad/info.json
@@ -33,60 +33,60 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"matrix": [0, 0], "x":0, "y":0},
-                {"matrix": [0, 1], "x":1, "y":0},
-                {"matrix": [0, 2], "x":2, "y":0},
-                {"matrix": [0, 3], "x":3, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"matrix": [1, 0], "x":0, "y":1},
-                {"matrix": [1, 1], "x":1, "y":1},
-                {"matrix": [1, 2], "x":2, "y":1},
-                {"matrix": [1, 3], "x":3, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"matrix": [2, 0], "x":0, "y":2},
-                {"matrix": [2, 1], "x":1, "y":2},
-                {"matrix": [2, 2], "x":2, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
 
-                {"matrix": [3, 0], "x":0, "y":3},
-                {"matrix": [3, 1], "x":1, "y":3},
-                {"matrix": [3, 2], "x":2, "y":3},
-                {"matrix": [2, 3], "x":3, "y":2, "h":2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
 
-                {"matrix": [4, 0], "x":0, "y":4},
-                {"matrix": [4, 1], "x":1, "y":4},
-                {"matrix": [4, 2], "x":2, "y":4},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
 
-                {"matrix": [5, 0], "x":0, "y":5, "w":2},
-                {"matrix": [5, 2], "x":2, "y":5},
-                {"matrix": [4, 3], "x":3, "y":4, "h":2}
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "h": 2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0 },
-                { "matrix": [0, 1], "x": 1, "y": 0 },
-                { "matrix": [0, 2], "x": 2, "y": 0 },
-                { "matrix": [0, 3], "x": 3, "y": 0 },
-                { "matrix": [1, 0], "x": 0, "y": 1 },
-                { "matrix": [1, 1], "x": 1, "y": 1 },
-                { "matrix": [1, 2], "x": 2, "y": 1 },
-                { "matrix": [1, 3], "x": 3, "y": 1 },
-                { "matrix": [2, 0], "x": 0, "y": 2 },
-                { "matrix": [2, 1], "x": 1, "y": 2 },
-                { "matrix": [2, 2], "x": 2, "y": 2 },
-                { "matrix": [2, 3], "x": 3, "y": 2 },
-                { "matrix": [3, 0], "x": 0, "y": 3 },
-                { "matrix": [3, 1], "x": 1, "y": 3 },
-                { "matrix": [3, 2], "x": 2, "y": 3 },
-                { "matrix": [3, 3], "x": 3, "y": 3 },
-                { "matrix": [4, 0], "x": 0, "y": 4 },
-                { "matrix": [4, 1], "x": 1, "y": 4 },
-                { "matrix": [4, 2], "x": 2, "y": 4 },
-                { "matrix": [4, 3], "x": 3, "y": 4 },
-                { "matrix": [5, 0], "x": 0, "y": 5 },
-                { "matrix": [5, 1], "x": 1, "y": 5 },
-                { "matrix": [5, 2], "x": 2, "y": 5 },
-                { "matrix": [5, 3], "x": 3, "y": 5 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [5, 0], "x": 0, "y": 5},
+                {"matrix": [5, 1], "x": 1, "y": 5},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+                {"matrix": [5, 3], "x": 3, "y": 5}
             ]
         }
     }
diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json
index 866d0413ca..ea5c4e8ab3 100644
--- a/keyboards/wuque/creek70/info.json
+++ b/keyboards/wuque/creek70/info.json
@@ -15,26 +15,7 @@
   },
   "matrix_pins": {
     "rows": ["B3", "B2", "F0", "D3", "D1"],
-    "cols": [
-      "E6",
-      "D4",
-      "D7",
-      "F7",
-      "D2",
-      "D5",
-      "D6",
-      "F5",
-      "F4",
-      "F1",
-      "C7",
-      "C6",
-      "B6",
-      "B5",
-      "B4",
-      "B7",
-      "B1",
-      "B0"
-    ]
+    "cols": ["E6", "D4", "D7", "F7", "D2", "D5", "D6", "F5", "F4", "F1", "C7", "C6", "B6", "B5", "B4", "B7", "B1", "B0"]
   },
   "usb": {
     "vid": "0x916D",
diff --git a/keyboards/xiudi/xd002/info.json b/keyboards/xiudi/xd002/info.json
index c36199e06e..cce509be79 100644
--- a/keyboards/xiudi/xd002/info.json
+++ b/keyboards/xiudi/xd002/info.json
@@ -19,8 +19,8 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0, "matrix": [0, 0]},
-        {"x":1, "y":0, "matrix": [0, 1]}
+        {"x": 0, "y": 0, "matrix": [0, 0]},
+        {"x": 1, "y": 0, "matrix": [0, 1]}
       ]
     }
   }
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json
index f9e374fee6..f15cc9c387 100644
--- a/keyboards/xiudi/xd004/info.json
+++ b/keyboards/xiudi/xd004/info.json
@@ -24,10 +24,10 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":3, "y":0, "matrix": [0, 3]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0, "matrix": [0, 3]}
             ]
         }
     }
diff --git a/keyboards/yandrstudio/transition80/info.json b/keyboards/yandrstudio/transition80/info.json
index 3214b88a41..baac6f4f9b 100644
--- a/keyboards/yandrstudio/transition80/info.json
+++ b/keyboards/yandrstudio/transition80/info.json
@@ -28,100 +28,100 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0, "matrix": [0, 0]},
-                {"label":"F1", "x":1.25, "y":0, "matrix": [0, 2]},
-                {"label":"F2", "x":2.25, "y":0, "matrix": [0, 3]},
-                {"label":"F3", "x":3.25, "y":0, "matrix": [0, 4]},
-                {"label":"F4", "x":4.25, "y":0, "matrix": [0, 5]},
-                {"label":"F5", "x":5.5, "y":0, "matrix": [0, 6]},
-                {"label":"F6", "x":6.5, "y":0, "matrix": [0, 7]},
-                {"label":"F7", "x":7.5, "y":0, "matrix": [0, 8]},
-                {"label":"F8", "x":8.5, "y":0, "matrix": [0, 9]},
-                {"label":"F9", "x":9.75, "y":0, "matrix": [0, 10]},
-                {"label":"F10", "x":10.75, "y":0, "matrix": [0, 11]},
-                {"label":"F11", "x":11.75, "y":0, "matrix": [0, 12]},
-                {"label":"F12", "x":12.75, "y":0, "matrix": [0, 13]},
-                {"label":"PrtSc", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"Scroll Lock", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"Pause", "x":17.25, "y":0, "matrix": [0, 16]},
+                {"label": "Esc", "x": 0, "y": 0, "matrix": [0, 0]},
+                {"label": "F1", "x": 1.25, "y": 0, "matrix": [0, 2]},
+                {"label": "F2", "x": 2.25, "y": 0, "matrix": [0, 3]},
+                {"label": "F3", "x": 3.25, "y": 0, "matrix": [0, 4]},
+                {"label": "F4", "x": 4.25, "y": 0, "matrix": [0, 5]},
+                {"label": "F5", "x": 5.5, "y": 0, "matrix": [0, 6]},
+                {"label": "F6", "x": 6.5, "y": 0, "matrix": [0, 7]},
+                {"label": "F7", "x": 7.5, "y": 0, "matrix": [0, 8]},
+                {"label": "F8", "x": 8.5, "y": 0, "matrix": [0, 9]},
+                {"label": "F9", "x": 9.75, "y": 0, "matrix": [0, 10]},
+                {"label": "F10", "x": 10.75, "y": 0, "matrix": [0, 11]},
+                {"label": "F11", "x": 11.75, "y": 0, "matrix": [0, 12]},
+                {"label": "F12", "x": 12.75, "y": 0, "matrix": [0, 13]},
+                {"label": "PrtSc", "x": 15.25, "y": 0, "matrix": [0, 14]},
+                {"label": "Scroll Lock", "x": 16.25, "y": 0, "matrix": [0, 15]},
+                {"label": "Pause", "x": 17.25, "y": 0, "matrix": [0, 16]},
 
-                {"label":"~", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"!", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"@", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"#", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"$", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"%", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"^", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"&", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"*", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"(", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":")", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"_", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"+", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
-                {"label":"|", "x":13, "y":1.5, "matrix": [3, 13]},
-                {"label":"Backspace", "x":14, "y":1.5, "matrix": [3, 14]},
-                {"label":"Insert", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"Home", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"PgUp", "x":17.25, "y":1.25, "matrix": [1, 16]},
+                {"label": "~", "x": 0, "y": 1.25, "matrix": [1, 0]},
+                {"label": "!", "x": 1, "y": 1.25, "matrix": [1, 1]},
+                {"label": "@", "x": 2, "y": 1.25, "matrix": [1, 2]},
+                {"label": "#", "x": 3, "y": 1.25, "matrix": [1, 3]},
+                {"label": "$", "x": 4, "y": 1.25, "matrix": [1, 4]},
+                {"label": "%", "x": 5, "y": 1.25, "matrix": [1, 5]},
+                {"label": "^", "x": 6, "y": 1.25, "matrix": [1, 6]},
+                {"label": "&", "x": 7, "y": 1.25, "matrix": [1, 7]},
+                {"label": "*", "x": 8, "y": 1.25, "matrix": [1, 8]},
+                {"label": "(", "x": 9, "y": 1.25, "matrix": [1, 9]},
+                {"label": ")", "x": 10, "y": 1.25, "matrix": [1, 10]},
+                {"label": "_", "x": 11, "y": 1.25, "matrix": [1, 11]},
+                {"label": "+", "x": 12, "y": 1.25, "matrix": [1, 12]},
+                {"label": "Backspace", "x": 13, "y": 1.25, "w": 2, "matrix": [1, 13]},
+                {"label": "|", "x": 13, "y": 1.5, "matrix": [3, 13]},
+                {"label": "Backspace", "x": 14, "y": 1.5, "matrix": [3, 14]},
+                {"label": "Insert", "x": 15.25, "y": 1.25, "matrix": [1, 14]},
+                {"label": "Home", "x": 16.25, "y": 1.25, "matrix": [1, 15]},
+                {"label": "PgUp", "x": 17.25, "y": 1.25, "matrix": [1, 16]},
 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"Q", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"W", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"E", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"R", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"T", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"Y", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"U", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"I", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"O", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"P", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"{", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"}", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
-                {"label":"Delete", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"End", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"PgDn", "x":17.25, "y":2.25, "matrix": [2, 16]},
+                {"label": "Tab", "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]},
+                {"label": "Q", "x": 1.5, "y": 2.25, "matrix": [2, 1]},
+                {"label": "W", "x": 2.5, "y": 2.25, "matrix": [2, 2]},
+                {"label": "E", "x": 3.5, "y": 2.25, "matrix": [2, 3]},
+                {"label": "R", "x": 4.5, "y": 2.25, "matrix": [2, 4]},
+                {"label": "T", "x": 5.5, "y": 2.25, "matrix": [2, 5]},
+                {"label": "Y", "x": 6.5, "y": 2.25, "matrix": [2, 6]},
+                {"label": "U", "x": 7.5, "y": 2.25, "matrix": [2, 7]},
+                {"label": "I", "x": 8.5, "y": 2.25, "matrix": [2, 8]},
+                {"label": "O", "x": 9.5, "y": 2.25, "matrix": [2, 9]},
+                {"label": "P", "x": 10.5, "y": 2.25, "matrix": [2, 10]},
+                {"label": "{", "x": 11.5, "y": 2.25, "matrix": [2, 11]},
+                {"label": "}", "x": 12.5, "y": 2.25, "matrix": [2, 12]},
+                {"label": "|", "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [2, 13]},
+                {"label": "Delete", "x": 15.25, "y": 2.25, "matrix": [2, 14]},
+                {"label": "End", "x": 16.25, "y": 2.25, "matrix": [2, 15]},
+                {"label": "PgDn", "x": 17.25, "y": 2.25, "matrix": [2, 16]},
 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"A", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"S", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"D", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"F", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"G", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"H", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"J", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"L", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":":", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"\"", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25, "matrix": [3, 12]},
+                {"label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]},
+                {"label": "A", "x": 1.75, "y": 3.25, "matrix": [3, 1]},
+                {"label": "S", "x": 2.75, "y": 3.25, "matrix": [3, 2]},
+                {"label": "D", "x": 3.75, "y": 3.25, "matrix": [3, 3]},
+                {"label": "F", "x": 4.75, "y": 3.25, "matrix": [3, 4]},
+                {"label": "G", "x": 5.75, "y": 3.25, "matrix": [3, 5]},
+                {"label": "H", "x": 6.75, "y": 3.25, "matrix": [3, 6]},
+                {"label": "J", "x": 7.75, "y": 3.25, "matrix": [3, 7]},
+                {"label": "K", "x": 8.75, "y": 3.25, "matrix": [3, 8]},
+                {"label": "L", "x": 9.75, "y": 3.25, "matrix": [3, 9]},
+                {"label": ":", "x": 10.75, "y": 3.25, "matrix": [3, 10]},
+                {"label": "\"", "x": 11.75, "y": 3.25, "matrix": [3, 11]},
+                {"label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25, "matrix": [3, 12]},
 
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25, "matrix": [4, 0]},
-                {"label":"Z", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"X", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"C", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"V", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"B", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"N", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"M", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"<", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":">", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"?", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
-                {"label":"Up", "x":16.25, "y":4.25, "matrix": [4, 14]},
+                {"label": "Shift", "x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0]},
+                {"label": "Z", "x": 2.25, "y": 4.25, "matrix": [4, 2]},
+                {"label": "X", "x": 3.25, "y": 4.25, "matrix": [4, 3]},
+                {"label": "C", "x": 4.25, "y": 4.25, "matrix": [4, 4]},
+                {"label": "V", "x": 5.25, "y": 4.25, "matrix": [4, 5]},
+                {"label": "B", "x": 6.25, "y": 4.25, "matrix": [4, 6]},
+                {"label": "N", "x": 7.25, "y": 4.25, "matrix": [4, 7]},
+                {"label": "M", "x": 8.25, "y": 4.25, "matrix": [4, 8]},
+                {"label": "<", "x": 9.25, "y": 4.25, "matrix": [4, 9]},
+                {"label": ">", "x": 10.25, "y": 4.25, "matrix": [4, 10]},
+                {"label": "?", "x": 11.25, "y": 4.25, "matrix": [4, 11]},
+                {"label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [4, 13]},
+                {"label": "Up", "x": 16.25, "y": 4.25, "matrix": [4, 14]},
 
-                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25, "matrix": [5, 0]},
-                {"label":"Win", "x":1.25, "y":5.5, "w":1.25, "matrix": [5, 1]},
-                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25, "matrix": [5, 2]},
-                {"label":"Space", "x":3.75, "y":5.5, "w":6.25, "matrix": [5, 6]},
-                {"label":"Menu", "x":10, "y":5.5, "w":1.25, "matrix": [5, 10]},
-                {"label":"Alt", "x":11.25, "y":5.5, "w":1.25, "matrix": [5, 11]},
-                {"label":"Fn", "x":12.5, "y":5.5, "w":1.25, "matrix": [5, 12]},
-                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25, "matrix": [5, 13]},
-                {"label":"Left", "x":15.25, "y":5.5, "matrix": [5, 14]},
-                {"label":"Down", "x":16.25, "y":5.5, "matrix": [5, 15]},
-                {"label":"Right", "x":17.25, "y":5.5, "matrix": [5, 16]}
+                {"label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]},
+                {"label": "Win", "x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]},
+                {"label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]},
+                {"label": "Space", "x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6]},
+                {"label": "Menu", "x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 10]},
+                {"label": "Alt", "x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 11]},
+                {"label": "Fn", "x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 12]},
+                {"label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 13]},
+                {"label": "Left", "x": 15.25, "y": 5.5, "matrix": [5, 14]},
+                {"label": "Down", "x": 16.25, "y": 5.5, "matrix": [5, 15]},
+                {"label": "Right", "x": 17.25, "y": 5.5, "matrix": [5, 16]}
             ]
         }
     }
diff --git a/keyboards/yeehaw/info.json b/keyboards/yeehaw/info.json
index 6db959539c..1bcda0bcda 100644
--- a/keyboards/yeehaw/info.json
+++ b/keyboards/yeehaw/info.json
@@ -26,20 +26,20 @@
   "layouts": {
       "LAYOUT": {
           "layout": [
-            {"x":1, "y":0, "matrix": [0, 0]},
-            {"x":1, "y":1, "matrix": [0, 1]},
-            {"x":2, "y":1.5, "matrix": [0, 2]},
-            {"x":3, "y":1.5, "matrix": [0, 3]},
-            {"x":1, "y":2, "matrix": [0, 4]},
-            {"x":4, "y":2, "matrix": [0, 5]},
-            {"x":2, "y":2.5, "matrix": [0, 6]},
-            {"x":3, "y":2.5, "matrix": [0, 7]},
-            {"x":0, "y":2.75, "matrix": [0, 8]},
-            {"x":1, "y":3, "matrix": [0, 9]},
-            {"x":4, "y":3, "matrix": [0, 10]},
-            {"x":2, "y":3.5, "matrix": [0, 11]},
-            {"x":3, "y":3.5, "matrix": [0, 12]},
-            {"x":2.5, "y":4.5, "matrix": [0, 13]}
+            {"x": 1, "y": 0, "matrix": [0, 0]},
+            {"x": 1, "y": 1, "matrix": [0, 1]},
+            {"x": 2, "y": 1.5, "matrix": [0, 2]},
+            {"x": 3, "y": 1.5, "matrix": [0, 3]},
+            {"x": 1, "y": 2, "matrix": [0, 4]},
+            {"x": 4, "y": 2, "matrix": [0, 5]},
+            {"x": 2, "y": 2.5, "matrix": [0, 6]},
+            {"x": 3, "y": 2.5, "matrix": [0, 7]},
+            {"x": 0, "y": 2.75, "matrix": [0, 8]},
+            {"x": 1, "y": 3, "matrix": [0, 9]},
+            {"x": 4, "y": 3, "matrix": [0, 10]},
+            {"x": 2, "y": 3.5, "matrix": [0, 11]},
+            {"x": 3, "y": 3.5, "matrix": [0, 12]},
+            {"x": 2.5, "y": 4.5, "matrix": [0, 13]}
           ]
       }
   }
diff --git a/keyboards/ymdk/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
index 3dc0cf87b9..930139be90 100644
--- a/keyboards/ymdk/ymd75/info.json
+++ b/keyboards/ymdk/ymd75/info.json
@@ -13,267 +13,267 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Del", "x":14, "y":0},
-                {"label":"Fn", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"!", "x":1, "y":1},
-                {"label":"@", "x":2, "y":1},
-                {"label":"#", "x":3, "y":1},
-                {"label":"$", "x":4, "y":1},
-                {"label":"%", "x":5, "y":1},
-                {"label":"^", "x":6, "y":1},
-                {"label":"&", "x":7, "y":1},
-                {"label":"*", "x":8, "y":1},
-                {"label":"(", "x":9, "y":1},
-                {"label":")", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"|", "x":13.5, "y":2, "w":1.5},
-                {"label":"End", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"\"", "x":11.75, "y":3},
-                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
-                {"label":"Page Up", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"\u2191", "x":14, "y":4},
-                {"label":"Page Down", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"x":3.75, "y":5, "w":6.25},
-                {"label":"Alt", "x":10, "y":5},
-                {"label":"Fn", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"\u2190", "x":13, "y":5},
-                {"label":"\u2193", "x":14, "y":5},
-                {"label":"\u2192", "x":15, "y":5}
+                {"label": "Esc", "x": 0, "y": 0},
+                {"label": "F1", "x": 1, "y": 0},
+                {"label": "F2", "x": 2, "y": 0},
+                {"label": "F3", "x": 3, "y": 0},
+                {"label": "F4", "x": 4, "y": 0},
+                {"label": "F5", "x": 5, "y": 0},
+                {"label": "F6", "x": 6, "y": 0},
+                {"label": "F7", "x": 7, "y": 0},
+                {"label": "F8", "x": 8, "y": 0},
+                {"label": "F9", "x": 9, "y": 0},
+                {"label": "F10", "x": 10, "y": 0},
+                {"label": "F11", "x": 11, "y": 0},
+                {"label": "F12", "x": 12, "y": 0},
+                {"label": "PrtSc", "x": 13, "y": 0},
+                {"label": "Del", "x": 14, "y": 0},
+                {"label": "Fn", "x": 15, "y": 0},
+                {"label": "~", "x": 0, "y": 1},
+                {"label": "!", "x": 1, "y": 1},
+                {"label": "@", "x": 2, "y": 1},
+                {"label": "#", "x": 3, "y": 1},
+                {"label": "$", "x": 4, "y": 1},
+                {"label": "%", "x": 5, "y": 1},
+                {"label": "^", "x": 6, "y": 1},
+                {"label": "&", "x": 7, "y": 1},
+                {"label": "*", "x": 8, "y": 1},
+                {"label": "(", "x": 9, "y": 1},
+                {"label": ")", "x": 10, "y": 1},
+                {"label": "_", "x": 11, "y": 1},
+                {"label": "+", "x": 12, "y": 1},
+                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
+                {"label": "Home", "x": 15, "y": 1},
+                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "x": 1.5, "y": 2},
+                {"label": "W", "x": 2.5, "y": 2},
+                {"label": "E", "x": 3.5, "y": 2},
+                {"label": "R", "x": 4.5, "y": 2},
+                {"label": "T", "x": 5.5, "y": 2},
+                {"label": "Y", "x": 6.5, "y": 2},
+                {"label": "U", "x": 7.5, "y": 2},
+                {"label": "I", "x": 8.5, "y": 2},
+                {"label": "O", "x": 9.5, "y": 2},
+                {"label": "P", "x": 10.5, "y": 2},
+                {"label": "{", "x": 11.5, "y": 2},
+                {"label": "}", "x": 12.5, "y": 2},
+                {"label": "|", "x": 13.5, "y": 2, "w": 1.5},
+                {"label": "End", "x": 15, "y": 2},
+                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "x": 1.75, "y": 3},
+                {"label": "S", "x": 2.75, "y": 3},
+                {"label": "D", "x": 3.75, "y": 3},
+                {"label": "F", "x": 4.75, "y": 3},
+                {"label": "G", "x": 5.75, "y": 3},
+                {"label": "H", "x": 6.75, "y": 3},
+                {"label": "J", "x": 7.75, "y": 3},
+                {"label": "K", "x": 8.75, "y": 3},
+                {"label": "L", "x": 9.75, "y": 3},
+                {"label": ":", "x": 10.75, "y": 3},
+                {"label": "\"", "x": 11.75, "y": 3},
+                {"label": "Enter", "x": 12.75, "y": 3, "w": 2.25},
+                {"label": "Page Up", "x": 15, "y": 3},
+                {"label": "Shift", "x": 0, "y": 4, "w": 2.25},
+                {"label": "Z", "x": 2.25, "y": 4},
+                {"label": "X", "x": 3.25, "y": 4},
+                {"label": "C", "x": 4.25, "y": 4},
+                {"label": "V", "x": 5.25, "y": 4},
+                {"label": "B", "x": 6.25, "y": 4},
+                {"label": "N", "x": 7.25, "y": 4},
+                {"label": "M", "x": 8.25, "y": 4},
+                {"label": "<", "x": 9.25, "y": 4},
+                {"label": ">", "x": 10.25, "y": 4},
+                {"label": "?", "x": 11.25, "y": 4},
+                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "\u2191", "x": 14, "y": 4},
+                {"label": "Page Down", "x": 15, "y": 4},
+                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                {"label": "GUI", "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"label": "Alt", "x": 10, "y": 5},
+                {"label": "Fn", "x": 11, "y": 5},
+                {"label": "Ctrl", "x": 12, "y": 5},
+                {"label": "\u2190", "x": 13, "y": 5},
+                {"label": "\u2193", "x": 14, "y": 5},
+                {"label": "\u2192", "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5},
-                {"label":"Menu", "x":11, "y":5},
-                {"label":"Ctrl", "x":12, "y":5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"label": "Esc", "x": 0, "y": 0},
+                {"label": "F1", "x": 1, "y": 0},
+                {"label": "F2", "x": 2, "y": 0},
+                {"label": "F3", "x": 3, "y": 0},
+                {"label": "F4", "x": 4, "y": 0},
+                {"label": "F5", "x": 5, "y": 0},
+                {"label": "F6", "x": 6, "y": 0},
+                {"label": "F7", "x": 7, "y": 0},
+                {"label": "F8", "x": 8, "y": 0},
+                {"label": "F9", "x": 9, "y": 0},
+                {"label": "F10", "x": 10, "y": 0},
+                {"label": "F11", "x": 11, "y": 0},
+                {"label": "F12", "x": 12, "y": 0},
+                {"label": "PrtSc", "x": 13, "y": 0},
+                {"label": "Pause", "x": 14, "y": 0},
+                {"label": "Delete", "x": 15, "y": 0},
+                {"label": "~", "x": 0, "y": 1},
+                {"label": "1", "x": 1, "y": 1},
+                {"label": "2", "x": 2, "y": 1},
+                {"label": "3", "x": 3, "y": 1},
+                {"label": "4", "x": 4, "y": 1},
+                {"label": "5", "x": 5, "y": 1},
+                {"label": "6", "x": 6, "y": 1},
+                {"label": "7", "x": 7, "y": 1},
+                {"label": "8", "x": 8, "y": 1},
+                {"label": "9", "x": 9, "y": 1},
+                {"label": "0", "x": 10, "y": 1},
+                {"label": "_", "x": 11, "y": 1},
+                {"label": "+", "x": 12, "y": 1},
+                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
+                {"label": "Home", "x": 15, "y": 1},
+                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "x": 1.5, "y": 2},
+                {"label": "W", "x": 2.5, "y": 2},
+                {"label": "E", "x": 3.5, "y": 2},
+                {"label": "R", "x": 4.5, "y": 2},
+                {"label": "T", "x": 5.5, "y": 2},
+                {"label": "Y", "x": 6.5, "y": 2},
+                {"label": "U", "x": 7.5, "y": 2},
+                {"label": "I", "x": 8.5, "y": 2},
+                {"label": "O", "x": 9.5, "y": 2},
+                {"label": "P", "x": 10.5, "y": 2},
+                {"label": "{", "x": 11.5, "y": 2},
+                {"label": "}", "x": 12.5, "y": 2},
+                {"label": "Page Up", "x": 15, "y": 2},
+                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "x": 1.75, "y": 3},
+                {"label": "S", "x": 2.75, "y": 3},
+                {"label": "D", "x": 3.75, "y": 3},
+                {"label": "F", "x": 4.75, "y": 3},
+                {"label": "G", "x": 5.75, "y": 3},
+                {"label": "H", "x": 6.75, "y": 3},
+                {"label": "J", "x": 7.75, "y": 3},
+                {"label": "K", "x": 8.75, "y": 3},
+                {"label": "L", "x": 9.75, "y": 3},
+                {"label": ":", "x": 10.75, "y": 3},
+                {"label": "@", "x": 11.75, "y": 3},
+                {"label": "~", "x": 12.75, "y": 3},
+                {"label": "Enter", "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Page Down", "x": 15, "y": 3},
+                {"label": "Shift", "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "x": 1.25, "y": 4},
+                {"label": "Z", "x": 2.25, "y": 4},
+                {"label": "X", "x": 3.25, "y": 4},
+                {"label": "C", "x": 4.25, "y": 4},
+                {"label": "V", "x": 5.25, "y": 4},
+                {"label": "B", "x": 6.25, "y": 4},
+                {"label": "N", "x": 7.25, "y": 4},
+                {"label": "M", "x": 8.25, "y": 4},
+                {"label": "<", "x": 9.25, "y": 4},
+                {"label": ">", "x": 10.25, "y": 4},
+                {"label": "?", "x": 11.25, "y": 4},
+                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "Up", "x": 14, "y": 4},
+                {"label": "End", "x": 15, "y": 4},
+                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "AltGr", "x": 10, "y": 5},
+                {"label": "Menu", "x": 11, "y": 5},
+                {"label": "Ctrl", "x": 12, "y": 5},
+                {"label": "Left", "x": 13, "y": 5},
+                {"label": "Down", "x": 14, "y": 5},
+                {"label": "Right", "x": 15, "y": 5}
             ]
         },
         "LAYOUT_75_iso_rwkl": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1, "y":0},
-                {"label":"F2", "x":2, "y":0},
-                {"label":"F3", "x":3, "y":0},
-                {"label":"F4", "x":4, "y":0},
-                {"label":"F5", "x":5, "y":0},
-                {"label":"F6", "x":6, "y":0},
-                {"label":"F7", "x":7, "y":0},
-                {"label":"F8", "x":8, "y":0},
-                {"label":"F9", "x":9, "y":0},
-                {"label":"F10", "x":10, "y":0},
-                {"label":"F11", "x":11, "y":0},
-                {"label":"F12", "x":12, "y":0},
-                {"label":"PrtSc", "x":13, "y":0},
-                {"label":"Pause", "x":14, "y":0},
-                {"label":"Delete", "x":15, "y":0},
-                {"label":"~", "x":0, "y":1},
-                {"label":"1", "x":1, "y":1},
-                {"label":"2", "x":2, "y":1},
-                {"label":"3", "x":3, "y":1},
-                {"label":"4", "x":4, "y":1},
-                {"label":"5", "x":5, "y":1},
-                {"label":"6", "x":6, "y":1},
-                {"label":"7", "x":7, "y":1},
-                {"label":"8", "x":8, "y":1},
-                {"label":"9", "x":9, "y":1},
-                {"label":"0", "x":10, "y":1},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1},
-                {"label":"Backspace", "x":13, "y":1, "w":2},
-                {"label":"Home", "x":15, "y":1},
-                {"label":"Tab", "x":0, "y":2, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2},
-                {"label":"W", "x":2.5, "y":2},
-                {"label":"E", "x":3.5, "y":2},
-                {"label":"R", "x":4.5, "y":2},
-                {"label":"T", "x":5.5, "y":2},
-                {"label":"Y", "x":6.5, "y":2},
-                {"label":"U", "x":7.5, "y":2},
-                {"label":"I", "x":8.5, "y":2},
-                {"label":"O", "x":9.5, "y":2},
-                {"label":"P", "x":10.5, "y":2},
-                {"label":"{", "x":11.5, "y":2},
-                {"label":"}", "x":12.5, "y":2},
-                {"label":"Page Up", "x":15, "y":2},
-                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
-                {"label":"A", "x":1.75, "y":3},
-                {"label":"S", "x":2.75, "y":3},
-                {"label":"D", "x":3.75, "y":3},
-                {"label":"F", "x":4.75, "y":3},
-                {"label":"G", "x":5.75, "y":3},
-                {"label":"H", "x":6.75, "y":3},
-                {"label":"J", "x":7.75, "y":3},
-                {"label":"K", "x":8.75, "y":3},
-                {"label":"L", "x":9.75, "y":3},
-                {"label":":", "x":10.75, "y":3},
-                {"label":"@", "x":11.75, "y":3},
-                {"label":"~", "x":12.75, "y":3},
-                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
-                {"label":"Page Down", "x":15, "y":3},
-                {"label":"Shift", "x":0, "y":4, "w":1.25},
-                {"label":"|", "x":1.25, "y":4},
-                {"label":"Z", "x":2.25, "y":4},
-                {"label":"X", "x":3.25, "y":4},
-                {"label":"C", "x":4.25, "y":4},
-                {"label":"V", "x":5.25, "y":4},
-                {"label":"B", "x":6.25, "y":4},
-                {"label":"N", "x":7.25, "y":4},
-                {"label":"M", "x":8.25, "y":4},
-                {"label":"<", "x":9.25, "y":4},
-                {"label":">", "x":10.25, "y":4},
-                {"label":"?", "x":11.25, "y":4},
-                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
-                {"label":"Up", "x":14, "y":4},
-                {"label":"End", "x":15, "y":4},
-                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
-                {"label":"Left", "x":13, "y":5},
-                {"label":"Down", "x":14, "y":5},
-                {"label":"Right", "x":15, "y":5}
+                {"label": "Esc", "x": 0, "y": 0},
+                {"label": "F1", "x": 1, "y": 0},
+                {"label": "F2", "x": 2, "y": 0},
+                {"label": "F3", "x": 3, "y": 0},
+                {"label": "F4", "x": 4, "y": 0},
+                {"label": "F5", "x": 5, "y": 0},
+                {"label": "F6", "x": 6, "y": 0},
+                {"label": "F7", "x": 7, "y": 0},
+                {"label": "F8", "x": 8, "y": 0},
+                {"label": "F9", "x": 9, "y": 0},
+                {"label": "F10", "x": 10, "y": 0},
+                {"label": "F11", "x": 11, "y": 0},
+                {"label": "F12", "x": 12, "y": 0},
+                {"label": "PrtSc", "x": 13, "y": 0},
+                {"label": "Pause", "x": 14, "y": 0},
+                {"label": "Delete", "x": 15, "y": 0},
+                {"label": "~", "x": 0, "y": 1},
+                {"label": "1", "x": 1, "y": 1},
+                {"label": "2", "x": 2, "y": 1},
+                {"label": "3", "x": 3, "y": 1},
+                {"label": "4", "x": 4, "y": 1},
+                {"label": "5", "x": 5, "y": 1},
+                {"label": "6", "x": 6, "y": 1},
+                {"label": "7", "x": 7, "y": 1},
+                {"label": "8", "x": 8, "y": 1},
+                {"label": "9", "x": 9, "y": 1},
+                {"label": "0", "x": 10, "y": 1},
+                {"label": "_", "x": 11, "y": 1},
+                {"label": "+", "x": 12, "y": 1},
+                {"label": "Backspace", "x": 13, "y": 1, "w": 2},
+                {"label": "Home", "x": 15, "y": 1},
+                {"label": "Tab", "x": 0, "y": 2, "w": 1.5},
+                {"label": "Q", "x": 1.5, "y": 2},
+                {"label": "W", "x": 2.5, "y": 2},
+                {"label": "E", "x": 3.5, "y": 2},
+                {"label": "R", "x": 4.5, "y": 2},
+                {"label": "T", "x": 5.5, "y": 2},
+                {"label": "Y", "x": 6.5, "y": 2},
+                {"label": "U", "x": 7.5, "y": 2},
+                {"label": "I", "x": 8.5, "y": 2},
+                {"label": "O", "x": 9.5, "y": 2},
+                {"label": "P", "x": 10.5, "y": 2},
+                {"label": "{", "x": 11.5, "y": 2},
+                {"label": "}", "x": 12.5, "y": 2},
+                {"label": "Page Up", "x": 15, "y": 2},
+                {"label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
+                {"label": "A", "x": 1.75, "y": 3},
+                {"label": "S", "x": 2.75, "y": 3},
+                {"label": "D", "x": 3.75, "y": 3},
+                {"label": "F", "x": 4.75, "y": 3},
+                {"label": "G", "x": 5.75, "y": 3},
+                {"label": "H", "x": 6.75, "y": 3},
+                {"label": "J", "x": 7.75, "y": 3},
+                {"label": "K", "x": 8.75, "y": 3},
+                {"label": "L", "x": 9.75, "y": 3},
+                {"label": ":", "x": 10.75, "y": 3},
+                {"label": "@", "x": 11.75, "y": 3},
+                {"label": "~", "x": 12.75, "y": 3},
+                {"label": "Enter", "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"label": "Page Down", "x": 15, "y": 3},
+                {"label": "Shift", "x": 0, "y": 4, "w": 1.25},
+                {"label": "|", "x": 1.25, "y": 4},
+                {"label": "Z", "x": 2.25, "y": 4},
+                {"label": "X", "x": 3.25, "y": 4},
+                {"label": "C", "x": 4.25, "y": 4},
+                {"label": "V", "x": 5.25, "y": 4},
+                {"label": "B", "x": 6.25, "y": 4},
+                {"label": "N", "x": 7.25, "y": 4},
+                {"label": "M", "x": 8.25, "y": 4},
+                {"label": "<", "x": 9.25, "y": 4},
+                {"label": ">", "x": 10.25, "y": 4},
+                {"label": "?", "x": 11.25, "y": 4},
+                {"label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
+                {"label": "Up", "x": 14, "y": 4},
+                {"label": "End", "x": 15, "y": 4},
+                {"label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
+                {"label": "Win", "x": 1.25, "y": 5, "w": 1.25},
+                {"label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space", "x": 3.75, "y": 5, "w": 6.25},
+                {"label": "AltGr", "x": 10, "y": 5, "w": 1.5},
+                {"label": "Ctrl", "x": 11.5, "y": 5, "w": 1.5},
+                {"label": "Left", "x": 13, "y": 5},
+                {"label": "Down", "x": 14, "y": 5},
+                {"label": "Right", "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/yushakobo/quick7/info.json b/keyboards/yushakobo/quick7/info.json
index 97885f55ed..79458d1564 100644
--- a/keyboards/yushakobo/quick7/info.json
+++ b/keyboards/yushakobo/quick7/info.json
@@ -29,15 +29,15 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":2, "y":0, "matrix": [0, 2]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":2, "y":1, "matrix": [1, 2]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":2, "y":2, "matrix": [2, 2]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]}
             ]
         }
     }
diff --git a/keyboards/yynmt/acperience12/rev1/info.json b/keyboards/yynmt/acperience12/rev1/info.json
index 92f5c96212..5eea37a35d 100644
--- a/keyboards/yynmt/acperience12/rev1/info.json
+++ b/keyboards/yynmt/acperience12/rev1/info.json
@@ -23,18 +23,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0, "matrix": [0, 0]},
-                {"x":1, "y":0, "matrix": [0, 1]},
-                {"x":0, "y":1, "matrix": [1, 0]},
-                {"x":1, "y":1, "matrix": [1, 1]},
-                {"x":0, "y":2, "matrix": [2, 0]},
-                {"x":1, "y":2, "matrix": [2, 1]},
-                {"x":0, "y":3, "matrix": [3, 0]},
-                {"x":1, "y":3, "matrix": [3, 1]},
-                {"x":0, "y":4, "matrix": [4, 0]},
-                {"x":1, "y":4, "matrix": [4, 1]},
-                {"x":0, "y":5, "matrix": [5, 0]},
-                {"x":1, "y":5, "matrix": [5, 1]}
+                {"x": 0, "y": 0, "matrix": [0, 0]},
+                {"x": 1, "y": 0, "matrix": [0, 1]},
+                {"x": 0, "y": 1, "matrix": [1, 0]},
+                {"x": 1, "y": 1, "matrix": [1, 1]},
+                {"x": 0, "y": 2, "matrix": [2, 0]},
+                {"x": 1, "y": 2, "matrix": [2, 1]},
+                {"x": 0, "y": 3, "matrix": [3, 0]},
+                {"x": 1, "y": 3, "matrix": [3, 1]},
+                {"x": 0, "y": 4, "matrix": [4, 0]},
+                {"x": 1, "y": 4, "matrix": [4, 1]},
+                {"x": 0, "y": 5, "matrix": [5, 0]},
+                {"x": 1, "y": 5, "matrix": [5, 1]}
             ]
         }
     }
diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
index 8a22e6272c..e21652ce0d 100644
--- a/keyboards/zicodia/tklfrlnrlmlao/info.json
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -26,10 +26,51 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "matrix": [0, 0], "x": 0, "y": 0               }, { "matrix": [0, 1], "x": 1.25, "y": 0    }, { "matrix": [0, 2], "x": 2.25, "y": 0            }, { "matrix": [0, 3], "x": 3.25, "y": 0   }, { "matrix": [0, 4], "x": 4.5, "y": 0    }, { "matrix": [0, 5], "x": 5.5, "y": 0     }, { "matrix": [0, 6], "x": 6.5, "y": 0                }, { "matrix": [0, 7], "x": 7.75, "y": 0    }, { "matrix": [0, 8], "x": 8.75, "y": 0    }, { "matrix": [0, 9], "x": 9.75, "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, "w": 1.5     }, { "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": [2, 0], "x": 0, "y": 2.25, "w": 1.5  }, { "matrix": [2, 1], "x": 1.5, "y": 2.25  }, { "matrix": [2, 2], "x": 2.5, "y": 2.25          }, { "matrix": [2, 3], "x": 3.5, "y": 2.25 }, { "matrix": [2, 4], "x": 4.5, "y": 2.25 }, { "matrix": [2, 5], "x": 5.5, "y": 2.25  }, { "matrix": [2, 6], "x": 6.5, "y": 2.25             },                                             { "matrix": [2, 8], "x": 8.75, "y": 2.25 },
-                { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 },                                                                                       { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25 }, { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { "matrix": [3, 8], "x": 8.75, "y": 3.25 }, { "matrix": [3, 9], "x": 9.75, "y": 3.25 }
+                {"matrix": [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.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+                {"matrix": [0, 9], "x": 9.75, "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, "w": 1.5},
+
+                {"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": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25},
+
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25}
             ]
         }
     }