`info.json` whitespace cleanups (#20651)

4 files changed, 287 insertions, 287 deletions

diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index 684da7d920..b6f05cfbcb 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -19,50 +19,50 @@
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [
-                {"label": "L06", "matrix": [0, 0], "x":  0, "y": 0.3},
-                {"label": "L05", "matrix": [0, 1], "x":  1, "y": 0.3},
-                {"label": "L04", "matrix": [0, 2], "x":  2, "y": 0.1},
-                {"label": "L03", "matrix": [0, 3], "x":  3, "y": 0},
-                {"label": "L02", "matrix": [0, 4], "x":  4, "y": 0.1},
-                {"label": "L01", "matrix": [0, 5], "x":  5, "y": 0.2},
-                {"label": "R01", "matrix": [4, 5], "x":  9, "y": 0.2},
+                {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3},
+                {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3},
+                {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1},
+                {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2},
+                {"label": "R01", "matrix": [4, 5], "x": 9, "y": 0.2},
                 {"label": "R02", "matrix": [4, 4], "x": 10, "y": 0.1},
                 {"label": "R03", "matrix": [4, 3], "x": 11, "y": 0},
                 {"label": "R04", "matrix": [4, 2], "x": 12, "y": 0.1},
                 {"label": "R05", "matrix": [4, 1], "x": 13, "y": 0.3},
                 {"label": "R06", "matrix": [4, 0], "x": 14, "y": 0.3},
 
-                {"label": "L12", "matrix": [1, 0], "x":  0, "y": 1.3},
-                {"label": "L11", "matrix": [1, 1], "x":  1, "y": 1.3},
-                {"label": "L10", "matrix": [1, 2], "x":  2, "y": 1.1},
-                {"label": "L09", "matrix": [1, 3], "x":  3, "y": 1},
-                {"label": "L08", "matrix": [1, 4], "x":  4, "y": 1.1},
-                {"label": "L07", "matrix": [1, 5], "x":  5, "y": 1.2},
-                {"label": "R07", "matrix": [5, 5], "x":  9, "y": 1.2},
+                {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3},
+                {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1},
+                {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1},
+                {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2},
+                {"label": "R07", "matrix": [5, 5], "x": 9, "y": 1.2},
                 {"label": "R08", "matrix": [5, 4], "x": 10, "y": 1.1},
                 {"label": "R09", "matrix": [5, 3], "x": 11, "y": 1},
                 {"label": "R10", "matrix": [5, 2], "x": 12, "y": 1.1},
                 {"label": "R11", "matrix": [5, 1], "x": 13, "y": 1.3},
                 {"label": "R12", "matrix": [5, 0], "x": 14, "y": 1.3},
 
-                {"label": "L18", "matrix": [2, 0], "x":  0, "y": 2.3},
-                {"label": "L17", "matrix": [2, 1], "x":  1, "y": 2.3},
-                {"label": "L16", "matrix": [2, 2], "x":  2, "y": 2.1},
-                {"label": "L15", "matrix": [2, 3], "x":  3, "y": 2},
-                {"label": "L14", "matrix": [2, 4], "x":  4, "y": 2.1},
-                {"label": "L13", "matrix": [2, 5], "x":  5, "y": 2.2},
-                {"label": "R13", "matrix": [6, 5], "x":  9, "y": 2.2},
+                {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3},
+                {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3},
+                {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1},
+                {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1},
+                {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2},
+                {"label": "R13", "matrix": [6, 5], "x": 9, "y": 2.2},
                 {"label": "R14", "matrix": [6, 4], "x": 10, "y": 2.1},
                 {"label": "R15", "matrix": [6, 3], "x": 11, "y": 2},
                 {"label": "R16", "matrix": [6, 2], "x": 12, "y": 2.1},
                 {"label": "R17", "matrix": [6, 1], "x": 13, "y": 2.3},
                 {"label": "R18", "matrix": [6, 0], "x": 14, "y": 2.3},
 
-                {"label": "L21", "matrix": [3, 3], "x":  4, "y": 3.7},
-                {"label": "L20", "matrix": [3, 4], "x":  5, "y": 3.7},
-                {"label": "L19", "matrix": [3, 5], "x":  6, "y": 3.2},
-                {"label": "R19", "matrix": [7, 5], "x":  8, "y": 3.2},
-                {"label": "R20", "matrix": [7, 4], "x":  9, "y": 3.7},
+                {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7},
+                {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7},
+                {"label": "L19", "matrix": [3, 5], "x": 6, "y": 3.2},
+                {"label": "R19", "matrix": [7, 5], "x": 8, "y": 3.2},
+                {"label": "R20", "matrix": [7, 4], "x": 9, "y": 3.7},
                 {"label": "R21", "matrix": [7, 3], "x": 10, "y": 3.7}
             ]
         }
@@ -110,36 +110,36 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 2, "x":  93, "y": 17},                   // L RGB1
-            {"flags": 2, "x":  59, "y":  3},                   // L RGB2
-            {"flags": 2, "x":  25, "y":  7},                   // L RGB3
-            {"flags": 2, "x":  29, "y": 49},                   // L RGB4
-            {"flags": 2, "x":  70, "y": 51},                   // L RGB5
+            {"flags": 2, "x": 93, "y": 17},                    // L RGB1
+            {"flags": 2, "x": 59, "y": 3},                     // L RGB2
+            {"flags": 2, "x": 25, "y": 7},                     // L RGB3
+            {"flags": 2, "x": 29, "y": 49},                    // L RGB4
+            {"flags": 2, "x": 70, "y": 51},                    // L RGB5
             {"flags": 2, "x": 104, "y": 55},                   // L RGB6
-            {"flags": 4, "matrix": [3, 2], "x":  95, "y": 63}, // L SW19
-            {"flags": 4, "matrix": [3, 1], "x":  80, "y": 58}, // L SW20
-            {"flags": 4, "matrix": [3, 0], "x":  60, "y": 55}, // L SW21
-            {"flags": 4, "matrix": [2, 5], "x":  85, "y": 39}, // L SW13
-            {"flags": 4, "matrix": [2, 4], "x":  68, "y": 37}, // L SW14
-            {"flags": 4, "matrix": [2, 3], "x":  50, "y": 35}, // L SW15
-            {"flags": 4, "matrix": [2, 2], "x":  33, "y": 37}, // L SW16
-            {"flags": 4, "matrix": [2, 1], "x":  16, "y": 42}, // L SW17
-            {"flags": 4, "matrix": [1, 5], "x":  85, "y": 21}, // L SW07
-            {"flags": 4, "matrix": [1, 4], "x":  68, "y": 19}, // L SW08
-            {"flags": 4, "matrix": [1, 3], "x":  50, "y": 13}, // L SW09
-            {"flags": 4, "matrix": [1, 2], "x":  33, "y": 20}, // L SW10
-            {"flags": 4, "matrix": [1, 1], "x":  16, "y": 24}, // L SW11
-            {"flags": 4, "matrix": [0, 5], "x":  85, "y":  4}, // L SW01
-            {"flags": 4, "matrix": [0, 4], "x":  68, "y":  2}, // L SW02
-            {"flags": 4, "matrix": [0, 3], "x":  50, "y":  0}, // L SW03
-            {"flags": 4, "matrix": [0, 2], "x":  33, "y":  3}, // L SW04
-            {"flags": 4, "matrix": [0, 1], "x":  16, "y":  7}, // L SW05
-            {"flags": 4, "matrix": [0, 0], "x":   0, "y":  7}, // L SW06
-            {"flags": 4, "matrix": [1, 0], "x":   0, "y": 24}, // L SW12
-            {"flags": 4, "matrix": [2, 0], "x":   0, "y": 41}, // L SW18
+            {"flags": 4, "matrix": [3, 2], "x": 95, "y": 63},  // L SW19
+            {"flags": 4, "matrix": [3, 1], "x": 80, "y": 58},  // L SW20
+            {"flags": 4, "matrix": [3, 0], "x": 60, "y": 55},  // L SW21
+            {"flags": 4, "matrix": [2, 5], "x": 85, "y": 39},  // L SW13
+            {"flags": 4, "matrix": [2, 4], "x": 68, "y": 37},  // L SW14
+            {"flags": 4, "matrix": [2, 3], "x": 50, "y": 35},  // L SW15
+            {"flags": 4, "matrix": [2, 2], "x": 33, "y": 37},  // L SW16
+            {"flags": 4, "matrix": [2, 1], "x": 16, "y": 42},  // L SW17
+            {"flags": 4, "matrix": [1, 5], "x": 85, "y": 21},  // L SW07
+            {"flags": 4, "matrix": [1, 4], "x": 68, "y": 19},  // L SW08
+            {"flags": 4, "matrix": [1, 3], "x": 50, "y": 13},  // L SW09
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 20},  // L SW10
+            {"flags": 4, "matrix": [1, 1], "x": 16, "y": 24},  // L SW11
+            {"flags": 4, "matrix": [0, 5], "x": 85, "y": 4},   // L SW01
+            {"flags": 4, "matrix": [0, 4], "x": 68, "y": 2},   // L SW02
+            {"flags": 4, "matrix": [0, 3], "x": 50, "y": 0},   // L SW03
+            {"flags": 4, "matrix": [0, 2], "x": 33, "y": 3},   // L SW04
+            {"flags": 4, "matrix": [0, 1], "x": 16, "y": 7},   // L SW05
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 7},    // L SW06
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 24},   // L SW12
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 41},   // L SW18
             {"flags": 2, "x": 131, "y": 17},                   // R RGB1
-            {"flags": 2, "x": 165, "y":  3},                   // R RGB2
-            {"flags": 2, "x": 199, "y":  7},                   // R RGB3
+            {"flags": 2, "x": 165, "y": 3},                    // R RGB2
+            {"flags": 2, "x": 199, "y": 7},                    // R RGB3
             {"flags": 2, "x": 195, "y": 49},                   // R RGB4
             {"flags": 2, "x": 154, "y": 51},                   // R RGB5
             {"flags": 2, "x": 120, "y": 55},                   // R RGB6
@@ -156,12 +156,12 @@
             {"flags": 4, "matrix": [5, 3], "x": 174, "y": 13}, // R SW09
             {"flags": 4, "matrix": [5, 2], "x": 191, "y": 20}, // R SW10
             {"flags": 4, "matrix": [5, 1], "x": 208, "y": 24}, // R SW11
-            {"flags": 4, "matrix": [4, 5], "x": 139, "y":  4}, // R SW01
-            {"flags": 4, "matrix": [4, 4], "x": 156, "y":  2}, // R SW02
-            {"flags": 4, "matrix": [4, 3], "x": 174, "y":  0}, // R SW03
-            {"flags": 4, "matrix": [4, 2], "x": 191, "y":  3}, // R SW04
-            {"flags": 4, "matrix": [4, 1], "x": 208, "y":  7}, // R SW05
-            {"flags": 4, "matrix": [4, 0], "x": 224, "y":  7}, // R SW06
+            {"flags": 4, "matrix": [4, 5], "x": 139, "y": 4},  // R SW01
+            {"flags": 4, "matrix": [4, 4], "x": 156, "y": 2},  // R SW02
+            {"flags": 4, "matrix": [4, 3], "x": 174, "y": 0},  // R SW03
+            {"flags": 4, "matrix": [4, 2], "x": 191, "y": 3},  // R SW04
+            {"flags": 4, "matrix": [4, 1], "x": 208, "y": 7},  // R SW05
+            {"flags": 4, "matrix": [4, 0], "x": 224, "y": 7},  // R SW06
             {"flags": 4, "matrix": [5, 0], "x": 224, "y": 24}, // R SW12
             {"flags": 4, "matrix": [6, 0], "x": 224, "y": 41}  // R SW18
         ]
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index efde159ccf..76b0edc116 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -13,12 +13,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "L01", "matrix": [0, 0], "x":    0, "y": 0.5},
-                {"label": "L02", "matrix": [0, 1], "x":    1, "y": 0.375},
-                {"label": "L03", "matrix": [0, 2], "x":    2, "y": 0.125},
-                {"label": "L04", "matrix": [0, 3], "x":    3, "y": 0},
-                {"label": "L05", "matrix": [0, 4], "x":    4, "y": 0.125},
-                {"label": "L06", "matrix": [0, 5], "x":    5, "y": 0.25},
+                {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5},
+                {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375},
+                {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125},
+                {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125},
+                {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25},
                 {"label": "R06", "matrix": [5, 5], "x": 10.5, "y": 0.25},
                 {"label": "R05", "matrix": [5, 4], "x": 11.5, "y": 0.125},
                 {"label": "R04", "matrix": [5, 3], "x": 12.5, "y": 0},
@@ -26,12 +26,12 @@
                 {"label": "R02", "matrix": [5, 1], "x": 14.5, "y": 0.375},
                 {"label": "R01", "matrix": [5, 0], "x": 15.5, "y": 0.5},
 
-                {"label": "L07", "matrix": [1, 0], "x":    0, "y": 1.5},
-                {"label": "L08", "matrix": [1, 1], "x":    1, "y": 1.375},
-                {"label": "L09", "matrix": [1, 2], "x":    2, "y": 1.125},
-                {"label": "L10", "matrix": [1, 3], "x":    3, "y": 1},
-                {"label": "L11", "matrix": [1, 4], "x":    4, "y": 1.125},
-                {"label": "L12", "matrix": [1, 5], "x":    5, "y": 1.25},
+                {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5},
+                {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375},
+                {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125},
+                {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125},
+                {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25},
                 {"label": "R12", "matrix": [6, 5], "x": 10.5, "y": 1.25},
                 {"label": "R11", "matrix": [6, 4], "x": 11.5, "y": 1.125},
                 {"label": "R10", "matrix": [6, 3], "x": 12.5, "y": 1},
@@ -39,12 +39,12 @@
                 {"label": "R08", "matrix": [6, 1], "x": 14.5, "y": 1.375},
                 {"label": "R07", "matrix": [6, 0], "x": 15.5, "y": 1.5},
 
-                {"label": "L13", "matrix": [2, 0], "x":    0, "y": 2.5},
-                {"label": "L14", "matrix": [2, 1], "x":    1, "y": 2.375},
-                {"label": "L15", "matrix": [2, 2], "x":    2, "y": 2.125},
-                {"label": "L16", "matrix": [2, 3], "x":    3, "y": 2},
-                {"label": "L17", "matrix": [2, 4], "x":    4, "y": 2.125},
-                {"label": "L18", "matrix": [2, 5], "x":    5, "y": 2.25},
+                {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5},
+                {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375},
+                {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125},
+                {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125},
+                {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25},
                 {"label": "R18", "matrix": [7, 5], "x": 10.5, "y": 2.25},
                 {"label": "R17", "matrix": [7, 4], "x": 11.5, "y": 2.125},
                 {"label": "R16", "matrix": [7, 3], "x": 12.5, "y": 2},
@@ -52,14 +52,14 @@
                 {"label": "R14", "matrix": [7, 1], "x": 14.5, "y": 2.375},
                 {"label": "R13", "matrix": [7, 0], "x": 15.5, "y": 2.5},
 
-                {"label": "L20", "matrix": [3, 0], "x":    0, "y": 3.5},
-                {"label": "L21", "matrix": [3, 1], "x":    1, "y": 3.375},
-                {"label": "L22", "matrix": [3, 2], "x":    2, "y": 3.125},
-                {"label": "L23", "matrix": [3, 3], "x":    3, "y": 3},
-                {"label": "L24", "matrix": [3, 4], "x":    4, "y": 3.125},
-                {"label": "L25", "matrix": [3, 5], "x":    5, "y": 3.25},
-                {"label": "L19", "matrix": [4, 1], "x":    6, "y": 2.75},
-                {"label": "R19", "matrix": [9, 1], "x":  9.5, "y": 2.75},
+                {"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5},
+                {"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375},
+                {"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125},
+                {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125},
+                {"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25},
+                {"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75},
+                {"label": "R19", "matrix": [9, 1], "x": 9.5, "y": 2.75},
                 {"label": "R25", "matrix": [8, 5], "x": 10.5, "y": 3.25},
                 {"label": "R24", "matrix": [8, 4], "x": 11.5, "y": 3.125},
                 {"label": "R23", "matrix": [8, 3], "x": 12.5, "y": 3},
@@ -67,14 +67,14 @@
                 {"label": "R21", "matrix": [8, 1], "x": 14.5, "y": 3.375},
                 {"label": "R20", "matrix": [8, 0], "x": 15.5, "y": 3.5},
 
-                {"label": "L26", "matrix": [4, 2], "x":  2.5, "y": 4.15},
-                {"label": "L27", "matrix": [4, 3], "x":  3.5, "y": 4.15},
-                {"label": "L28", "matrix": [4, 4], "x":  4.5, "y": 4.25},
-                {"label": "L29", "matrix": [4, 5], "x":    6, "y": 4.25},
-                {"label": "R29", "matrix": [9, 5], "x":  9.5, "y": 4.25},
-                {"label": "R28", "matrix": [9, 4], "x":   11, "y": 4.25},
-                {"label": "R27", "matrix": [9, 3], "x":   12, "y": 4.15},
-                {"label": "R26", "matrix": [9, 2], "x":   13, "y": 4.15}
+                {"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15},
+                {"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15},
+                {"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25},
+                {"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25},
+                {"label": "R29", "matrix": [9, 5], "x": 9.5, "y": 4.25},
+                {"label": "R28", "matrix": [9, 4], "x": 11, "y": 4.25},
+                {"label": "R27", "matrix": [9, 3], "x": 12, "y": 4.15},
+                {"label": "R26", "matrix": [9, 2], "x": 13, "y": 4.15}
             ]
         }
     },
@@ -121,51 +121,51 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 2, "x":  51, "y": 13},                   // L RGB1
-            {"flags": 2, "x":  22, "y": 18},                   // L RGB2
-            {"flags": 2, "x":  22, "y": 53},                   // L RGB3
-            {"flags": 2, "x":  58, "y": 60},                   // L RGB4
-            {"flags": 2, "x":  87, "y": 56},                   // L RGB5
-            {"flags": 4, "matrix": [0, 0], "x":   0, "y":  8}, // L SW01
-            {"flags": 4, "matrix": [0, 1], "x":  14, "y":  6}, // L SW02
-            {"flags": 4, "matrix": [0, 2], "x":  29, "y":  2}, // L SW03
-            {"flags": 4, "matrix": [0, 3], "x":  43, "y":  0}, // L SW04
-            {"flags": 4, "matrix": [0, 4], "x":  58, "y":  2}, // L SW05
-            {"flags": 4, "matrix": [0, 5], "x":  72, "y":  4}, // L SW06
-            {"flags": 4, "matrix": [1, 0], "x":   0, "y": 23}, // L SW07
-            {"flags": 4, "matrix": [1, 1], "x":  14, "y": 21}, // L SW08
-            {"flags": 4, "matrix": [1, 2], "x":  29, "y": 17}, // L SW09
-            {"flags": 4, "matrix": [1, 3], "x":  43, "y": 15}, // L SW10
-            {"flags": 4, "matrix": [1, 4], "x":  58, "y": 17}, // L SW11
-            {"flags": 4, "matrix": [1, 5], "x":  72, "y": 19}, // L SW12
-            {"flags": 4, "matrix": [2, 0], "x":   0, "y": 38}, // L SW13
-            {"flags": 4, "matrix": [2, 1], "x":  14, "y": 36}, // L SW14
-            {"flags": 4, "matrix": [2, 2], "x":  29, "y": 32}, // L SW15
-            {"flags": 4, "matrix": [2, 3], "x":  43, "y": 30}, // L SW16
-            {"flags": 4, "matrix": [2, 4], "x":  58, "y": 32}, // L SW17
-            {"flags": 4, "matrix": [2, 5], "x":  72, "y": 34}, // L SW18
-            {"flags": 4, "matrix": [3, 0], "x":   0, "y": 53}, // L SW20
-            {"flags": 4, "matrix": [3, 1], "x":  14, "y": 51}, // L SW21
-            {"flags": 4, "matrix": [3, 2], "x":  29, "y": 47}, // L SW22
-            {"flags": 4, "matrix": [3, 3], "x":  43, "y": 45}, // L SW23
-            {"flags": 4, "matrix": [3, 4], "x":  58, "y": 47}, // L SW24
-            {"flags": 4, "matrix": [3, 5], "x":  72, "y": 49}, // L SW25
-            {"flags": 4, "matrix": [4, 1], "x":  87, "y": 41}, // L SW19
-            {"flags": 4, "matrix": [4, 2], "x":  36, "y": 62}, // L SW26
-            {"flags": 4, "matrix": [4, 3], "x":  51, "y": 62}, // L SW27
-            {"flags": 4, "matrix": [4, 4], "x":  65, "y": 64}, // L SW28
-            {"flags": 4, "matrix": [4, 5], "x":  87, "y": 64}, // L SW29
+            {"flags": 2, "x": 51, "y": 13},                    // L RGB1
+            {"flags": 2, "x": 22, "y": 18},                    // L RGB2
+            {"flags": 2, "x": 22, "y": 53},                    // L RGB3
+            {"flags": 2, "x": 58, "y": 60},                    // L RGB4
+            {"flags": 2, "x": 87, "y": 56},                    // L RGB5
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 8},    // L SW01
+            {"flags": 4, "matrix": [0, 1], "x": 14, "y": 6},   // L SW02
+            {"flags": 4, "matrix": [0, 2], "x": 29, "y": 2},   // L SW03
+            {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0},   // L SW04
+            {"flags": 4, "matrix": [0, 4], "x": 58, "y": 2},   // L SW05
+            {"flags": 4, "matrix": [0, 5], "x": 72, "y": 4},   // L SW06
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 23},   // L SW07
+            {"flags": 4, "matrix": [1, 1], "x": 14, "y": 21},  // L SW08
+            {"flags": 4, "matrix": [1, 2], "x": 29, "y": 17},  // L SW09
+            {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15},  // L SW10
+            {"flags": 4, "matrix": [1, 4], "x": 58, "y": 17},  // L SW11
+            {"flags": 4, "matrix": [1, 5], "x": 72, "y": 19},  // L SW12
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 38},   // L SW13
+            {"flags": 4, "matrix": [2, 1], "x": 14, "y": 36},  // L SW14
+            {"flags": 4, "matrix": [2, 2], "x": 29, "y": 32},  // L SW15
+            {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30},  // L SW16
+            {"flags": 4, "matrix": [2, 4], "x": 58, "y": 32},  // L SW17
+            {"flags": 4, "matrix": [2, 5], "x": 72, "y": 34},  // L SW18
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 53},   // L SW20
+            {"flags": 4, "matrix": [3, 1], "x": 14, "y": 51},  // L SW21
+            {"flags": 4, "matrix": [3, 2], "x": 29, "y": 47},  // L SW22
+            {"flags": 4, "matrix": [3, 3], "x": 43, "y": 45},  // L SW23
+            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 47},  // L SW24
+            {"flags": 4, "matrix": [3, 5], "x": 72, "y": 49},  // L SW25
+            {"flags": 4, "matrix": [4, 1], "x": 87, "y": 41},  // L SW19
+            {"flags": 4, "matrix": [4, 2], "x": 36, "y": 62},  // L SW26
+            {"flags": 4, "matrix": [4, 3], "x": 51, "y": 62},  // L SW27
+            {"flags": 4, "matrix": [4, 4], "x": 65, "y": 64},  // L SW28
+            {"flags": 4, "matrix": [4, 5], "x": 87, "y": 64},  // L SW29
             {"flags": 2, "x": 173, "y": 13},                   // R RGB1
             {"flags": 2, "x": 202, "y": 18},                   // R RGB2
             {"flags": 2, "x": 202, "y": 53},                   // R RGB3
             {"flags": 2, "x": 166, "y": 60},                   // R RGB4
             {"flags": 2, "x": 137, "y": 56},                   // R RGB5
-            {"flags": 4, "matrix": [5, 5], "x": 152, "y":  4}, // R SW06
-            {"flags": 4, "matrix": [5, 4], "x": 166, "y":  2}, // R SW05
-            {"flags": 4, "matrix": [5, 3], "x": 181, "y":  0}, // R SW04
-            {"flags": 4, "matrix": [5, 2], "x": 195, "y":  2}, // R SW03
-            {"flags": 4, "matrix": [5, 1], "x": 210, "y":  6}, // R SW02
-            {"flags": 4, "matrix": [5, 0], "x": 224, "y":  8}, // R SW01
+            {"flags": 4, "matrix": [5, 5], "x": 152, "y": 4},  // R SW06
+            {"flags": 4, "matrix": [5, 4], "x": 166, "y": 2},  // R SW05
+            {"flags": 4, "matrix": [5, 3], "x": 181, "y": 0},  // R SW04
+            {"flags": 4, "matrix": [5, 2], "x": 195, "y": 2},  // R SW03
+            {"flags": 4, "matrix": [5, 1], "x": 210, "y": 6},  // R SW02
+            {"flags": 4, "matrix": [5, 0], "x": 224, "y": 8},  // R SW01
             {"flags": 4, "matrix": [6, 5], "x": 152, "y": 19}, // R SW12
             {"flags": 4, "matrix": [6, 4], "x": 166, "y": 17}, // R SW11
             {"flags": 4, "matrix": [6, 3], "x": 181, "y": 15}, // R SW10
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index e5406cc721..ec85447084 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -19,36 +19,36 @@
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"label": "L01", "matrix": [0, 4], "x":  0, "y": 0.93},
-                {"label": "L02", "matrix": [0, 3], "x":  1, "y": 0.31},
-                {"label": "L03", "matrix": [0, 2], "x":  2, "y": 0},
-                {"label": "L04", "matrix": [0, 1], "x":  3, "y": 0.28},
-                {"label": "L05", "matrix": [0, 0], "x":  4, "y": 0.42},
-                {"label": "R05", "matrix": [4, 0], "x":  7, "y": 0.42},
-                {"label": "R04", "matrix": [4, 1], "x":  8, "y": 0.28},
-                {"label": "R03", "matrix": [4, 2], "x":  9, "y": 0},
+                {"label": "L01", "matrix": [0, 4], "x": 0, "y": 0.93},
+                {"label": "L02", "matrix": [0, 3], "x": 1, "y": 0.31},
+                {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L04", "matrix": [0, 1], "x": 3, "y": 0.28},
+                {"label": "L05", "matrix": [0, 0], "x": 4, "y": 0.42},
+                {"label": "R05", "matrix": [4, 0], "x": 7, "y": 0.42},
+                {"label": "R04", "matrix": [4, 1], "x": 8, "y": 0.28},
+                {"label": "R03", "matrix": [4, 2], "x": 9, "y": 0},
                 {"label": "R02", "matrix": [4, 3], "x": 10, "y": 0.31},
                 {"label": "R01", "matrix": [4, 4], "x": 11, "y": 0.93},
 
-                {"label": "L06", "matrix": [1, 4], "x":  0, "y": 1.93},
-                {"label": "L07", "matrix": [1, 3], "x":  1, "y": 1.31},
-                {"label": "L08", "matrix": [1, 2], "x":  2, "y": 1},
-                {"label": "L09", "matrix": [1, 1], "x":  3, "y": 1.28},
-                {"label": "L10", "matrix": [1, 0], "x":  4, "y": 1.42},
-                {"label": "R10", "matrix": [5, 0], "x":  7, "y": 1.42},
-                {"label": "R09", "matrix": [5, 1], "x":  8, "y": 1.28},
-                {"label": "R08", "matrix": [5, 2], "x":  9, "y": 1},
+                {"label": "L06", "matrix": [1, 4], "x": 0, "y": 1.93},
+                {"label": "L07", "matrix": [1, 3], "x": 1, "y": 1.31},
+                {"label": "L08", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L09", "matrix": [1, 1], "x": 3, "y": 1.28},
+                {"label": "L10", "matrix": [1, 0], "x": 4, "y": 1.42},
+                {"label": "R10", "matrix": [5, 0], "x": 7, "y": 1.42},
+                {"label": "R09", "matrix": [5, 1], "x": 8, "y": 1.28},
+                {"label": "R08", "matrix": [5, 2], "x": 9, "y": 1},
                 {"label": "R07", "matrix": [5, 3], "x": 10, "y": 1.31},
                 {"label": "R06", "matrix": [5, 4], "x": 11, "y": 1.93},
 
-                {"label": "L11", "matrix": [2, 4], "x":  0, "y": 2.93},
-                {"label": "L12", "matrix": [2, 3], "x":  1, "y": 2.31},
-                {"label": "L13", "matrix": [2, 2], "x":  2, "y": 2},
-                {"label": "L14", "matrix": [2, 1], "x":  3, "y": 2.28},
-                {"label": "L15", "matrix": [2, 0], "x":  4, "y": 2.42},
-                {"label": "R15", "matrix": [6, 0], "x":  7, "y": 2.42},
-                {"label": "R14", "matrix": [6, 1], "x":  8, "y": 2.28},
-                {"label": "R13", "matrix": [6, 2], "x":  9, "y": 2},
+                {"label": "L11", "matrix": [2, 4], "x": 0, "y": 2.93},
+                {"label": "L12", "matrix": [2, 3], "x": 1, "y": 2.31},
+                {"label": "L13", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L14", "matrix": [2, 1], "x": 3, "y": 2.28},
+                {"label": "L15", "matrix": [2, 0], "x": 4, "y": 2.42},
+                {"label": "R15", "matrix": [6, 0], "x": 7, "y": 2.42},
+                {"label": "R14", "matrix": [6, 1], "x": 8, "y": 2.28},
+                {"label": "R13", "matrix": [6, 2], "x": 9, "y": 2},
                 {"label": "R12", "matrix": [6, 3], "x": 10, "y": 2.31},
                 {"label": "R11", "matrix": [6, 4], "x": 11, "y": 2.93},
 
@@ -107,39 +107,39 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 2, "x":  71, "y": 15},
-            {"flags": 2, "x":  51, "y":  8},
-            {"flags": 2, "x":  10, "y": 13},
-            {"flags": 2, "x":  10, "y": 42},
-            {"flags": 2, "x":  41, "y": 45},
-            {"flags": 2, "x":  76, "y": 50},
-            {"flags": 4, "matrix": [0, 4], "x":   0, "y": 15},
-            {"flags": 4, "matrix": [0, 3], "x":  20, "y":  5},
-            {"flags": 4, "matrix": [0, 2], "x":  41, "y":  0},
-            {"flags": 4, "matrix": [0, 1], "x":  61, "y":  4},
-            {"flags": 4, "matrix": [0, 0], "x":  81, "y":  7},
-            {"flags": 4, "matrix": [1, 4], "x":   0, "y": 31},
-            {"flags": 4, "matrix": [1, 3], "x":  20, "y": 21},
-            {"flags": 4, "matrix": [1, 2], "x":  41, "y": 16},
-            {"flags": 4, "matrix": [1, 1], "x":  61, "y": 20},
-            {"flags": 4, "matrix": [1, 0], "x":  81, "y": 23},
-            {"flags": 4, "matrix": [2, 4], "x":   0, "y": 47},
-            {"flags": 4, "matrix": [2, 3], "x":  20, "y": 37},
-            {"flags": 4, "matrix": [2, 2], "x":  41, "y": 32},
-            {"flags": 4, "matrix": [2, 1], "x":  61, "y": 36},
-            {"flags": 4, "matrix": [2, 0], "x":  81, "y": 39},
-            {"flags": 4, "matrix": [3, 1], "x":  71, "y": 60},
-            {"flags": 4, "matrix": [3, 0], "x":  92, "y": 64},
+            {"flags": 2, "x": 71, "y": 15},
+            {"flags": 2, "x": 51, "y": 8},
+            {"flags": 2, "x": 10, "y": 13},
+            {"flags": 2, "x": 10, "y": 42},
+            {"flags": 2, "x": 41, "y": 45},
+            {"flags": 2, "x": 76, "y": 50},
+            {"flags": 4, "matrix": [0, 4], "x": 0, "y": 15},
+            {"flags": 4, "matrix": [0, 3], "x": 20, "y": 5},
+            {"flags": 4, "matrix": [0, 2], "x": 41, "y": 0},
+            {"flags": 4, "matrix": [0, 1], "x": 61, "y": 4},
+            {"flags": 4, "matrix": [0, 0], "x": 81, "y": 7},
+            {"flags": 4, "matrix": [1, 4], "x": 0, "y": 31},
+            {"flags": 4, "matrix": [1, 3], "x": 20, "y": 21},
+            {"flags": 4, "matrix": [1, 2], "x": 41, "y": 16},
+            {"flags": 4, "matrix": [1, 1], "x": 61, "y": 20},
+            {"flags": 4, "matrix": [1, 0], "x": 81, "y": 23},
+            {"flags": 4, "matrix": [2, 4], "x": 0, "y": 47},
+            {"flags": 4, "matrix": [2, 3], "x": 20, "y": 37},
+            {"flags": 4, "matrix": [2, 2], "x": 41, "y": 32},
+            {"flags": 4, "matrix": [2, 1], "x": 61, "y": 36},
+            {"flags": 4, "matrix": [2, 0], "x": 81, "y": 39},
+            {"flags": 4, "matrix": [3, 1], "x": 71, "y": 60},
+            {"flags": 4, "matrix": [3, 0], "x": 92, "y": 64},
             {"flags": 2, "x": 150, "y": 15},
-            {"flags": 2, "x": 190, "y":  8},
+            {"flags": 2, "x": 190, "y": 8},
             {"flags": 2, "x": 210, "y": 13},
             {"flags": 2, "x": 220, "y": 42},
             {"flags": 2, "x": 183, "y": 45},
             {"flags": 2, "x": 155, "y": 50},
-            {"flags": 4, "matrix": [4, 0], "x": 143, "y":  7},
-            {"flags": 4, "matrix": [4, 1], "x": 163, "y":  4},
-            {"flags": 4, "matrix": [4, 2], "x": 183, "y":  0},
-            {"flags": 4, "matrix": [4, 3], "x": 204, "y":  5},
+            {"flags": 4, "matrix": [4, 0], "x": 143, "y": 7},
+            {"flags": 4, "matrix": [4, 1], "x": 163, "y": 4},
+            {"flags": 4, "matrix": [4, 2], "x": 183, "y": 0},
+            {"flags": 4, "matrix": [4, 3], "x": 204, "y": 5},
             {"flags": 4, "matrix": [4, 4], "x": 224, "y": 15},
             {"flags": 4, "matrix": [5, 0], "x": 143, "y": 23},
             {"flags": 4, "matrix": [5, 1], "x": 163, "y": 20},
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 8989eec072..564ba9b0e2 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -19,12 +19,12 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "L06", "matrix": [0, 6], "x":    0, "y": 0.75},
-                {"label": "L05", "matrix": [0, 5], "x":    1, "y": 0.75},
-                {"label": "L04", "matrix": [0, 4], "x":    2, "y": 0.25},
-                {"label": "L03", "matrix": [0, 3], "x":    3, "y": 0},
-                {"label": "L02", "matrix": [0, 2], "x":    4, "y": 0.25},
-                {"label": "L01", "matrix": [0, 1], "x":    5, "y": 0.5},
+                {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
+                {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
+                {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
+                {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
                 {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
                 {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
                 {"label": "R03", "matrix": [4, 3], "x": 12.5, "y": 0},
@@ -32,12 +32,12 @@
                 {"label": "R05", "matrix": [4, 5], "x": 14.5, "y": 0.75},
                 {"label": "R06", "matrix": [4, 6], "x": 15.5, "y": 0.75},
 
-                {"label": "L12", "matrix": [1, 6], "x":    0, "y": 1.75},
-                {"label": "L11", "matrix": [1, 5], "x":    1, "y": 1.75},
-                {"label": "L10", "matrix": [1, 4], "x":    2, "y": 1.25},
-                {"label": "L09", "matrix": [1, 3], "x":    3, "y": 1},
-                {"label": "L08", "matrix": [1, 2], "x":    4, "y": 1.25},
-                {"label": "L07", "matrix": [1, 1], "x":    5, "y": 1.5},
+                {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
+                {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
+                {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
+                {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
+                {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
                 {"label": "R07", "matrix": [5, 1], "x": 10.5, "y": 1.5},
                 {"label": "R08", "matrix": [5, 2], "x": 11.5, "y": 1.25},
                 {"label": "R09", "matrix": [5, 3], "x": 12.5, "y": 1},
@@ -45,16 +45,16 @@
                 {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
                 {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
 
-                {"label": "L20", "matrix": [2, 6], "x":    0, "y": 2.75},
-                {"label": "L19", "matrix": [2, 5], "x":    1, "y": 2.75},
-                {"label": "L18", "matrix": [2, 4], "x":    2, "y": 2.25},
-                {"label": "L17", "matrix": [2, 3], "x":    3, "y": 2},
-                {"label": "L16", "matrix": [2, 2], "x":    4, "y": 2.25},
-                {"label": "L15", "matrix": [2, 1], "x":    5, "y": 2.5},
-                {"label": "L14", "matrix": [3, 3], "x":    6, "y": 3},
-                {"label": "L13", "matrix": [2, 0], "x":    7, "y": 3.25},
-                {"label": "R13", "matrix": [6, 0], "x":  8.5, "y": 3.25},
-                {"label": "R14", "matrix": [7, 3], "x":  9.5, "y": 3},
+                {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
+                {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
+                {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
+                {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
+                {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
+                {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
+                {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
+                {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
+                {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
                 {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
                 {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
                 {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
@@ -62,48 +62,48 @@
                 {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
                 {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
 
-                {"label": "L25", "matrix": [3, 4], "x":  2.5, "y": 3.25},
-                {"label": "L24", "matrix": [3, 2], "x":  3.5, "y": 3.25},
-                {"label": "L23", "matrix": [3, 1], "x":  4.5, "y": 3.5},
-                {"label": "L22", "matrix": [3, 5], "x":  5.5, "y": 4},
-                {"label": "L21", "matrix": [3, 0], "x":  6.5, "y": 4.25},
-                {"label": "R21", "matrix": [7, 0], "x":    9, "y": 4.25},
-                {"label": "R22", "matrix": [7, 5], "x":   10, "y": 4},
-                {"label": "R23", "matrix": [7, 1], "x":   11, "y": 3.5},
-                {"label": "R24", "matrix": [7, 2], "x":   12, "y": 3.25},
-                {"label": "R25", "matrix": [7, 4], "x":   13, "y": 3.25},
+                {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
+                {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
+                {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
+                {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
+                {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
+                {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
+                {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
+                {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
             ]
         },
         "LAYOUT_stack": {
             "layout": [
-                {"label": "L06", "matrix": [0, 6], "x":    0, "y": 0.75},
-                {"label": "L05", "matrix": [0, 5], "x":    1, "y": 0.75},
-                {"label": "L04", "matrix": [0, 4], "x":    2, "y": 0.25},
-                {"label": "L03", "matrix": [0, 3], "x":    3, "y": 0},
-                {"label": "L02", "matrix": [0, 2], "x":    4, "y": 0.25},
-                {"label": "L01", "matrix": [0, 1], "x":    5, "y": 0.5},
+                {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75},
+                {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75},
+                {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25},
+                {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5},
 
-                {"label": "L12", "matrix": [1, 6], "x":    0, "y": 1.75},
-                {"label": "L11", "matrix": [1, 5], "x":    1, "y": 1.75},
-                {"label": "L10", "matrix": [1, 4], "x":    2, "y": 1.25},
-                {"label": "L09", "matrix": [1, 3], "x":    3, "y": 1},
-                {"label": "L08", "matrix": [1, 2], "x":    4, "y": 1.25},
-                {"label": "L07", "matrix": [1, 1], "x":    5, "y": 1.5},
+                {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75},
+                {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75},
+                {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25},
+                {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25},
+                {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5},
 
-                {"label": "L20", "matrix": [2, 6], "x":    0, "y": 2.75},
-                {"label": "L19", "matrix": [2, 5], "x":    1, "y": 2.75},
-                {"label": "L18", "matrix": [2, 4], "x":    2, "y": 2.25},
-                {"label": "L17", "matrix": [2, 3], "x":    3, "y": 2},
-                {"label": "L16", "matrix": [2, 2], "x":    4, "y": 2.25},
-                {"label": "L15", "matrix": [2, 1], "x":    5, "y": 2.5},
-                {"label": "L14", "matrix": [3, 3], "x":    6, "y": 3},
-                {"label": "L13", "matrix": [2, 0], "x":    7, "y": 3.25},
+                {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75},
+                {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75},
+                {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25},
+                {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25},
+                {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5},
+                {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3},
+                {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25},
 
-                {"label": "L25", "matrix": [3, 4], "x":  2.5, "y": 3.25},
-                {"label": "L24", "matrix": [3, 2], "x":  3.5, "y": 3.25},
-                {"label": "L23", "matrix": [3, 1], "x":  4.5, "y": 3.5},
-                {"label": "L22", "matrix": [3, 5], "x":  5.5, "y": 4},
-                {"label": "L21", "matrix": [3, 0], "x":  6.5, "y": 4.25},
+                {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25},
+                {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25},
+                {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5},
+                {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4},
+                {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25},
 
                 {"label": "R01", "matrix": [4, 1], "x": 10.5, "y": 0.5},
                 {"label": "R02", "matrix": [4, 2], "x": 11.5, "y": 0.25},
@@ -119,8 +119,8 @@
                 {"label": "R11", "matrix": [5, 5], "x": 14.5, "y": 1.75},
                 {"label": "R12", "matrix": [5, 6], "x": 15.5, "y": 1.75},
 
-                {"label": "R13", "matrix": [6, 0], "x":  8.5, "y": 3.25},
-                {"label": "R14", "matrix": [7, 3], "x":  9.5, "y": 3},
+                {"label": "R13", "matrix": [6, 0], "x": 8.5, "y": 3.25},
+                {"label": "R14", "matrix": [7, 3], "x": 9.5, "y": 3},
                 {"label": "R15", "matrix": [6, 1], "x": 10.5, "y": 2.5},
                 {"label": "R16", "matrix": [6, 2], "x": 11.5, "y": 2.25},
                 {"label": "R17", "matrix": [6, 3], "x": 12.5, "y": 2},
@@ -128,11 +128,11 @@
                 {"label": "R19", "matrix": [6, 5], "x": 14.5, "y": 2.75},
                 {"label": "R20", "matrix": [6, 6], "x": 15.5, "y": 2.75},
 
-                {"label": "R21", "matrix": [7, 0], "x":    9, "y": 4.25},
-                {"label": "R22", "matrix": [7, 5], "x":   10, "y": 4},
-                {"label": "R23", "matrix": [7, 1], "x":   11, "y": 3.5},
-                {"label": "R24", "matrix": [7, 2], "x":   12, "y": 3.25},
-                {"label": "R25", "matrix": [7, 4], "x":   13, "y": 3.25},
+                {"label": "R21", "matrix": [7, 0], "x": 9, "y": 4.25},
+                {"label": "R22", "matrix": [7, 5], "x": 10, "y": 4},
+                {"label": "R23", "matrix": [7, 1], "x": 11, "y": 3.5},
+                {"label": "R24", "matrix": [7, 2], "x": 12, "y": 3.25},
+                {"label": "R25", "matrix": [7, 4], "x": 13, "y": 3.25},
             ]
         }
     },
@@ -179,40 +179,40 @@
     "rgb_matrix": {
         "driver": "WS2812",
         "layout": [
-            {"flags": 2, "x":  75, "y":  2},                   // L RGB1
-            {"flags": 2, "x":  50, "y":  1},                   // L RGB2
-            {"flags": 2, "x":  14, "y":  4},                   // L RGB3
-            {"flags": 2, "x":  25, "y": 45},                   // L RGB4
-            {"flags": 2, "x":  58, "y": 49},                   // L RGB5
-            {"flags": 2, "x":  94, "y": 53},                   // L RGB6
-            {"flags": 4, "matrix": [3, 0], "x":  94, "y": 64}, // L SW21
-            {"flags": 4, "matrix": [3, 5], "x":  79, "y": 60}, // L SW22
-            {"flags": 4, "matrix": [3, 1], "x":  65, "y": 53}, // L SW23
-            {"flags": 4, "matrix": [3, 2], "x":  51, "y": 49}, // L SW24
-            {"flags": 4, "matrix": [3, 4], "x":  36, "y": 49}, // L SW25
+            {"flags": 2, "x": 75, "y": 2},                     // L RGB1
+            {"flags": 2, "x": 50, "y": 1},                     // L RGB2
+            {"flags": 2, "x": 14, "y": 4},                     // L RGB3
+            {"flags": 2, "x": 25, "y": 45},                    // L RGB4
+            {"flags": 2, "x": 58, "y": 49},                    // L RGB5
+            {"flags": 2, "x": 94, "y": 53},                    // L RGB6
+            {"flags": 4, "matrix": [3, 0], "x": 94, "y": 64},  // L SW21
+            {"flags": 4, "matrix": [3, 5], "x": 79, "y": 60},  // L SW22
+            {"flags": 4, "matrix": [3, 1], "x": 65, "y": 53},  // L SW23
+            {"flags": 4, "matrix": [3, 2], "x": 51, "y": 49},  // L SW24
+            {"flags": 4, "matrix": [3, 4], "x": 36, "y": 49},  // L SW25
             {"flags": 4, "matrix": [2, 0], "x": 101, "y": 49}, // L SW13
-            {"flags": 4, "matrix": [3, 3], "x":  87, "y": 45}, // L SW14
-            {"flags": 4, "matrix": [2, 1], "x":  72, "y": 38}, // L SW15
-            {"flags": 4, "matrix": [2, 2], "x":  58, "y": 34}, // L SW16
-            {"flags": 4, "matrix": [2, 3], "x":  43, "y": 30}, // L SW17
-            {"flags": 4, "matrix": [2, 4], "x":  29, "y": 34}, // L SW18
-            {"flags": 4, "matrix": [2, 5], "x":  14, "y": 41}, // L SW19
-            {"flags": 4, "matrix": [2, 6], "x":   0, "y": 41}, // L SW20
-            {"flags": 4, "matrix": [1, 1], "x":  72, "y": 23}, // L SW07
-            {"flags": 4, "matrix": [1, 2], "x":  58, "y": 19}, // L SW08
-            {"flags": 4, "matrix": [1, 3], "x":  43, "y": 15}, // L SW09
-            {"flags": 4, "matrix": [1, 4], "x":  29, "y": 19}, // L SW10
-            {"flags": 4, "matrix": [1, 5], "x":  14, "y": 26}, // L SW11
-            {"flags": 4, "matrix": [1, 6], "x":   0, "y": 26}, // L SW12
-            {"flags": 4, "matrix": [0, 1], "x":  72, "y":  8}, // L SW01
-            {"flags": 4, "matrix": [0, 2], "x":  58, "y":  4}, // L SW02
-            {"flags": 4, "matrix": [0, 3], "x":  43, "y":  0}, // L SW03
-            {"flags": 4, "matrix": [0, 4], "x":  29, "y":  4}, // L SW04
-            {"flags": 4, "matrix": [0, 5], "x":  14, "y": 11}, // L SW05
-            {"flags": 4, "matrix": [0, 6], "x":   0, "y": 11}, // L SW06
-            {"flags": 2, "x": 149, "y":  2},                   // R RGB1
-            {"flags": 2, "x": 174, "y":  1},                   // R RGB2
-            {"flags": 2, "x": 210, "y":  4},                   // R RGB3
+            {"flags": 4, "matrix": [3, 3], "x": 87, "y": 45},  // L SW14
+            {"flags": 4, "matrix": [2, 1], "x": 72, "y": 38},  // L SW15
+            {"flags": 4, "matrix": [2, 2], "x": 58, "y": 34},  // L SW16
+            {"flags": 4, "matrix": [2, 3], "x": 43, "y": 30},  // L SW17
+            {"flags": 4, "matrix": [2, 4], "x": 29, "y": 34},  // L SW18
+            {"flags": 4, "matrix": [2, 5], "x": 14, "y": 41},  // L SW19
+            {"flags": 4, "matrix": [2, 6], "x": 0, "y": 41},   // L SW20
+            {"flags": 4, "matrix": [1, 1], "x": 72, "y": 23},  // L SW07
+            {"flags": 4, "matrix": [1, 2], "x": 58, "y": 19},  // L SW08
+            {"flags": 4, "matrix": [1, 3], "x": 43, "y": 15},  // L SW09
+            {"flags": 4, "matrix": [1, 4], "x": 29, "y": 19},  // L SW10
+            {"flags": 4, "matrix": [1, 5], "x": 14, "y": 26},  // L SW11
+            {"flags": 4, "matrix": [1, 6], "x": 0, "y": 26},   // L SW12
+            {"flags": 4, "matrix": [0, 1], "x": 72, "y": 8},   // L SW01
+            {"flags": 4, "matrix": [0, 2], "x": 58, "y": 4},   // L SW02
+            {"flags": 4, "matrix": [0, 3], "x": 43, "y": 0},   // L SW03
+            {"flags": 4, "matrix": [0, 4], "x": 29, "y": 4},   // L SW04
+            {"flags": 4, "matrix": [0, 5], "x": 14, "y": 11},  // L SW05
+            {"flags": 4, "matrix": [0, 6], "x": 0, "y": 11},   // L SW06
+            {"flags": 2, "x": 149, "y": 2},                    // R RGB1
+            {"flags": 2, "x": 174, "y": 1},                    // R RGB2
+            {"flags": 2, "x": 210, "y": 4},                    // R RGB3
             {"flags": 2, "x": 199, "y": 45},                   // R RGB4
             {"flags": 2, "x": 166, "y": 49},                   // R RGB5
             {"flags": 2, "x": 130, "y": 53},                   // R RGB6
@@ -235,10 +235,10 @@
             {"flags": 4, "matrix": [5, 4], "x": 195, "y": 19}, // R SW10
             {"flags": 4, "matrix": [5, 5], "x": 210, "y": 26}, // R SW11
             {"flags": 4, "matrix": [5, 6], "x": 224, "y": 26}, // R SW12
-            {"flags": 4, "matrix": [4, 1], "x": 152, "y":  8}, // R SW01
-            {"flags": 4, "matrix": [4, 2], "x": 166, "y":  4}, // R SW02
-            {"flags": 4, "matrix": [4, 3], "x": 181, "y":  0}, // R SW03
-            {"flags": 4, "matrix": [4, 4], "x": 195, "y":  4}, // R SW04
+            {"flags": 4, "matrix": [4, 1], "x": 152, "y": 8},  // R SW01
+            {"flags": 4, "matrix": [4, 2], "x": 166, "y": 4},  // R SW02
+            {"flags": 4, "matrix": [4, 3], "x": 181, "y": 0},  // R SW03
+            {"flags": 4, "matrix": [4, 4], "x": 195, "y": 4},  // R SW04
             {"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
             {"flags": 4, "matrix": [4, 6], "x": 224, "y": 11}, // R SW06
         ]