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

3 files changed, 150 insertions, 961 deletions

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}
             ]
         }
     }