diff --git a/v3/ah/haven60.json b/v3/ah/haven60.json
index ce3ad5a4d0..0ee787c268 100644
--- a/v3/ah/haven60.json
+++ b/v3/ah/haven60.json
@@ -2,28 +2,19 @@
   "name": "Atelier_Haven Haven60",
   "vendorId": "0x4446",
   "productId": "0x4660",
-  "keycodes": [
-    "qmk_lighting"
-  ],
-  "menus": [
-    "qmk_rgblight"
-  ],
   "matrix": {
     "rows": 5,
     "cols": 14
   },
+  "keycodes": ["qmk_lighting"],
+  "menus": ["qmk_rgblight"],
   "layouts": {
     "labels": [
       "Split Backspace",
       "ISO Enter",
       "Split Left Shift",
       "Split Right Shift",
-      [
-        "Bottom Row",
-        "Full",
-        "WKL",
-        "HHKB (7u)"
-      ]
+      ["Bottom Row", "Full", "WKL", "HHKB (7u)"]
     ],
     "keymap": [
       [
diff --git a/v3/craftwalk/craftwalk.json b/v3/craftwalk/craftwalk.json
index ec1dcc1b2f..d48c714851 100644
--- a/v3/craftwalk/craftwalk.json
+++ b/v3/craftwalk/craftwalk.json
@@ -1,21 +1,107 @@
 {
-    "name": "craftwalk",
-    "vendorId": "0x7364",
-    "productId": "0x2E8F",
-    "matrix": {"rows": 3, "cols": 7},
-    "menus": ["qmk_rgblight"],
-    "keycodes": [ "qmk_lighting" ],
-    "layouts": {
-        "keymap": [
-          [{"x": 2.5},"0,2"],
-          [{"y": -0.75, "x": 1.5}, "0,1", {"x": 1}, "0,3"],
-          [{"y": -0.25, "x": 2.5}, "1,2"],
-          [{"y": -0.75, "x": 1.5}, "1,1", {"x": 1}, "1,3"],
-          [{"y": -0.25, "x": 2.5, "c": "#aaaaaa"}, "2,2", {"x": 1, "c": "#cccccc"}, "2,4"],
-          [{"y": -0.75, "x": 1.5, "c": "#aaaaaa"}, "2,1", {"x": 1}, "2,3"],
-          [{"r": 20, "rx": 5, "ry": 2.25, "y": 0.5, "x": 0.75, "h": 1.5}, "2,5", {"h": 1.5}, "2,6"],
-          [{"r": -12, "rx": 0.5, "ry": 1.5, "x": -0.5, "c": "#777777"}, "1,0"],
-          [{"x": -0.5, "c": "#aaaaaa"}, "2,0"]
-        ]
-    }
+  "name": "craftwalk",
+  "vendorId": "0x7364",
+  "productId": "0x2E8F",
+  "matrix": {
+    "rows": 3,
+    "cols": 7
+  },
+  "keycodes": ["qmk_lighting"],
+  "menus": ["qmk_rgblight"],
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "x": 2.5
+        },
+        "0,2"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 1.5
+        },
+        "0,1",
+        {
+          "x": 1
+        },
+        "0,3"
+      ],
+      [
+        {
+          "y": -0.25,
+          "x": 2.5
+        },
+        "1,2"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 1.5
+        },
+        "1,1",
+        {
+          "x": 1
+        },
+        "1,3"
+      ],
+      [
+        {
+          "y": -0.25,
+          "x": 2.5,
+          "c": "#aaaaaa"
+        },
+        "2,2",
+        {
+          "x": 1,
+          "c": "#cccccc"
+        },
+        "2,4"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 1.5,
+          "c": "#aaaaaa"
+        },
+        "2,1",
+        {
+          "x": 1
+        },
+        "2,3"
+      ],
+      [
+        {
+          "r": 20,
+          "rx": 5,
+          "ry": 2.25,
+          "y": 0.5,
+          "x": 0.75,
+          "h": 1.5
+        },
+        "2,5",
+        {
+          "h": 1.5
+        },
+        "2,6"
+      ],
+      [
+        {
+          "r": -12,
+          "rx": 0.5,
+          "ry": 1.5,
+          "x": -0.5,
+          "c": "#777777"
+        },
+        "1,0"
+      ],
+      [
+        {
+          "x": -0.5,
+          "c": "#aaaaaa"
+        },
+        "2,0"
+      ]
+    ]
+  }
 }
diff --git a/v3/dcpedit/masonry/masonry.json b/v3/dcpedit/masonry/masonry.json
index 538ab0f4f5..822b8f369a 100644
--- a/v3/dcpedit/masonry/masonry.json
+++ b/v3/dcpedit/masonry/masonry.json
@@ -210,4 +210,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/v3/era/linx3/n87/n87.json b/v3/era/linx3/n87/n87.json
index d371866a44..48f3d2ed71 100644
--- a/v3/era/linx3/n87/n87.json
+++ b/v3/era/linx3/n87/n87.json
@@ -6,17 +6,10 @@
     "rows": 6,
     "cols": 17
   },
-  "keycodes": [
-    "qmk_lighting"
-  ],
-  "menus": [
-    "qmk_rgb_matrix"
-  ],
+  "keycodes": ["qmk_lighting"],
+  "menus": ["qmk_rgb_matrix"],
   "layouts": {
-    "labels": [
-      "Split Backspace",
-      "Split Right Shift"
-    ],
+    "labels": ["Split Backspace", "Split Right Shift"],
     "keymap": [
       [
         {
@@ -227,4 +220,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/v3/era/sirind/tomak/tomak.json b/v3/era/sirind/tomak/tomak.json
index d981eeb827..ae876de0b9 100644
--- a/v3/era/sirind/tomak/tomak.json
+++ b/v3/era/sirind/tomak/tomak.json
@@ -1,7 +1,7 @@
 {
   "name": "Tomak",
-  "productId": "0x0006",
   "vendorId": "0x4552",
+  "productId": "0x0006",
   "matrix": {
     "rows": 12,
     "cols": 11
@@ -48,9 +48,7 @@
       "shortName": "IN Sat-"
     }
   ],
-  "keycodes": [
-    "qmk_lighting"
-  ],
+  "keycodes": ["qmk_lighting"],
   "menus": [
     {
       "label": "Lighting",
@@ -61,24 +59,13 @@
             {
               "label": "Brightness",
               "type": "range",
-              "options": [
-                0,
-                255
-              ],
-              "content": [
-                "id_qmk_rgb_matrix_brightness",
-                3,
-                1
-              ]
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
             },
             {
               "label": "Effect",
               "type": "dropdown",
-              "content": [
-                "id_qmk_rgb_matrix_effect",
-                3,
-                2
-              ],
+              "content": ["id_qmk_rgb_matrix_effect", 3, 2],
               "options": [
                 "All Off",
                 "Solid Color",
@@ -131,25 +118,14 @@
               "showIf": "{id_qmk_rgb_matrix_effect} != 0",
               "label": "Effect Speed",
               "type": "range",
-              "options": [
-                0,
-                255
-              ],
-              "content": [
-                "id_qmk_rgb_matrix_effect_speed",
-                3,
-                3
-              ]
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
             },
             {
               "showIf": "{id_qmk_rgb_matrix_effect} != 0 && {id_qmk_rgb_matrix_effect} != 24 && {id_qmk_rgb_matrix_effect} != 28 && {id_qmk_rgb_matrix_effect} != 29 && {id_qmk_rgb_matrix_effect} != 32",
               "label": "Color",
               "type": "color",
-              "content": [
-                "id_qmk_rgb_matrix_color",
-                3,
-                4
-              ]
+              "content": ["id_qmk_rgb_matrix_color", 3, 4]
             }
           ]
         },
@@ -159,56 +135,32 @@
             {
               "label": "Indicator toggle",
               "type": "toggle",
-              "content": [
-                "id_custom_indicator_toggle",
-                0,
-                0
-              ]
+              "content": ["id_custom_indicator_toggle", 0, 0]
             },
             {
               "showIf": "{id_custom_indicator_toggle} != 0",
               "label": "Override indicator",
               "type": "toggle",
-              "content": [
-                "id_custom_indicator_override",
-                0,
-                1
-              ]
+              "content": ["id_custom_indicator_override", 0, 1]
             },
             {
               "label": "Brightness",
               "type": "range",
-              "options": [
-                0,
-                255
-              ],
-              "content": [
-                "id_custom_indicator_brightness",
-                0,
-                2
-              ]
+              "options": [0, 255],
+              "content": ["id_custom_indicator_brightness", 0, 2]
             },
             {
               "label": "Color",
               "type": "color",
-              "content": [
-                "id_custom_indicator_color",
-                0,
-                3
-              ]
+              "content": ["id_custom_indicator_color", 0, 3]
             }
           ]
         }
       ]
     }
   ],
-  "layouts":
-  {
-    "labels": [
-      "Split Backspace",
-      "Split Right shift",
-      "Split Right space"
-    ],
+  "layouts": {
+    "labels": ["Split Backspace", "Split Right shift", "Split Right space"],
     "keymap": [
       [
         {
@@ -462,4 +414,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/v3/jaykeeb/jk65/jk65.json b/v3/jaykeeb/jk65/jk65.json
index ef52cc59ba..5a9f096d8a 100644
--- a/v3/jaykeeb/jk65/jk65.json
+++ b/v3/jaykeeb/jk65/jk65.json
@@ -2,7 +2,10 @@
   "name": "JK65",
   "vendorId": "0x414C",
   "productId": "0x7765",
-  "matrix": {"rows": 5, "cols": 15},
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
   "layouts": {
     "labels": [
       "Split Backspace",
@@ -38,7 +41,7 @@
         "0,13\n\n\n0,0",
         "0,14",
         {
-          "x":0.25
+          "x": 0.25
         },
         "0,13\n\n\n0,1",
         "1,13\n\n\n0,1"
@@ -48,7 +51,7 @@
           "x": 2.5,
           "w": 1.5
         },
-        "1,0",        
+        "1,0",
         {
           "c": "#cccccc"
         },
@@ -107,7 +110,7 @@
         {
           "w": 1.25
         },
-        "3,0\n\n\n1,1",        
+        "3,0\n\n\n1,1",
         {
           "c": "#cccccc"
         },
@@ -117,7 +120,7 @@
           "x": 0.25,
           "w": 2.25
         },
-        "3,0\n\n\n1,0",        
+        "3,0\n\n\n1,0",
         {
           "c": "#cccccc"
         },
@@ -139,13 +142,13 @@
         {
           "c": "#777777"
         },
-        "3,13",        
+        "3,13",
         {
           "c": "#aaaaaa"
         },
         "3,14"
       ],
-      [        
+      [
         {
           "x": 2.5,
           "w": 1.5
@@ -172,7 +175,7 @@
         "4,13",
         "4,14"
       ],
-      [        
+      [
         {
           "c": "#aaaaaa",
           "x": 2.5,
diff --git a/v3/keebio/irispad/irispad-rev8.json b/v3/keebio/irispad/irispad-rev8.json
index 43b96a984b..78a5922684 100644
--- a/v3/keebio/irispad/irispad-rev8.json
+++ b/v3/keebio/irispad/irispad-rev8.json
@@ -2,7 +2,10 @@
   "name": "Irispad Rev. 8",
   "vendorId": "0xCB10",
   "productId": "0x8356",
-  "matrix": {"rows": 5, "cols": 6},
+  "matrix": {
+    "rows": 5,
+    "cols": 6
+  },
   "keycodes": ["qmk_lighting"],
   "menus": ["qmk_rgb_matrix"],
   "layouts": {
@@ -11,39 +14,192 @@
       "Top Left Encoder"
     ],
     "keymap": [
-      [ {"x": 3}, "0,3" ],
-      [ {"y": -0.87, "x": 2}, "0,2", {"x": 1}, "0,4" ],
-      [ {"y": -0.88, "x": 5}, "0,5" ],
       [
-        {"y": -0.87, "c": "#777777"},
+        {
+          "x": 3
+        },
+        "0,3"
+      ],
+      [
+        {
+          "y": -0.87,
+          "x": 2
+        },
+        "0,2",
+        {
+          "x": 1
+        },
+        "0,4"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 5
+        },
+        "0,5"
+      ],
+      [
+        {
+          "y": -0.87,
+          "c": "#777777"
+        },
         "0,0\n\n\n1,0",
-        {"c": "#cccccc"},
+        {
+          "c": "#cccccc"
+        },
         "0,1",
-        {"x": 4.25, "c": "#777777"},
+        {
+          "x": 4.25,
+          "c": "#777777"
+        },
         "0,0\n\n\n1,1\n\n\n\n\n\ne1"
       ],
-      [ {"y": -0.38, "x": 3, "c": "#cccccc"}, "1,3" ],
-      [ {"y": -0.87, "x": 2}, "1,2", {"x": 1}, "1,4" ],
-      [ {"y": -0.88, "x": 5}, "1,5" ],
-      [ {"y": -0.87, "c": "#aaaaaa"}, "1,0", {"c": "#cccccc"}, "1,1" ],
-      [ {"y": -0.38, "x": 3}, "2,3" ],
-      [ {"y": -0.87, "x": 2}, "2,2", {"x": 1}, "2,4" ],
-      [ {"y": -0.88, "x": 5}, "2,5" ],
-      [ {"y": -0.87, "c": "#aaaaaa"}, "2,0", {"c": "#cccccc"}, "2,1" ],
-      [ {"y": -0.38, "x": 3}, "3,3" ],
-      [ {"y": -0.87, "x": 2}, "3,2", {"x": 1}, "3,4" ],
-      [ {"y": -0.88, "x": 5}, "3,5" ],
-      [ {"y": -0.87, "c": "#aaaaaa"}, "3,0", {"c": "#cccccc"}, "3,1" ],
-      [ {"y": -0.13, "x": 3.5, "c": "#aaaaaa"}, "4,2" ],
-      [ {"y": -0.87, "x": 4.5}, "4,3" ],
-      [
-        {"r": 30, "rx": 8, "y": 4.13, "x": 0.6, "c": "#777777"},
+      [
+        {
+          "y": -0.38,
+          "x": 3,
+          "c": "#cccccc"
+        },
+        "1,3"
+      ],
+      [
+        {
+          "y": -0.87,
+          "x": 2
+        },
+        "1,2",
+        {
+          "x": 1
+        },
+        "1,4"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 5
+        },
+        "1,5"
+      ],
+      [
+        {
+          "y": -0.87,
+          "c": "#aaaaaa"
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1"
+      ],
+      [
+        {
+          "y": -0.38,
+          "x": 3
+        },
+        "2,3"
+      ],
+      [
+        {
+          "y": -0.87,
+          "x": 2
+        },
+        "2,2",
+        {
+          "x": 1
+        },
+        "2,4"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 5
+        },
+        "2,5"
+      ],
+      [
+        {
+          "y": -0.87,
+          "c": "#aaaaaa"
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1"
+      ],
+      [
+        {
+          "y": -0.38,
+          "x": 3
+        },
+        "3,3"
+      ],
+      [
+        {
+          "y": -0.87,
+          "x": 2
+        },
+        "3,2",
+        {
+          "x": 1
+        },
+        "3,4"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 5
+        },
+        "3,5"
+      ],
+      [
+        {
+          "y": -0.87,
+          "c": "#aaaaaa"
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,1"
+      ],
+      [
+        {
+          "y": -0.13,
+          "x": 3.5,
+          "c": "#aaaaaa"
+        },
+        "4,2"
+      ],
+      [
+        {
+          "y": -0.87,
+          "x": 4.5
+        },
+        "4,3"
+      ],
+      [
+        {
+          "r": 30,
+          "rx": 8,
+          "y": 4.13,
+          "x": 0.6,
+          "c": "#777777"
+        },
         "4,5\n\n\n0,0",
         "4,5\n\n\n0,1\n\n\n\n\n\ne0",
-        {"h": 2},
+        {
+          "h": 2
+        },
         "4,4\n\n\n0,2"
       ],
-      [ {"x": 0.6}, "4,4\n\n\n0,0", "4,4\n\n\n0,1" ]
+      [
+        {
+          "x": 0.6
+        },
+        "4,4\n\n\n0,0",
+        "4,4\n\n\n0,1"
+      ]
     ]
   }
 }
diff --git a/v3/pinky/3/pinky3.json b/v3/pinky/3/pinky3.json
index 4b90c35051..fbb506606d 100644
--- a/v3/pinky/3/pinky3.json
+++ b/v3/pinky/3/pinky3.json
@@ -1,290 +1,317 @@
 {
-    "name": "Pinky3",
-    "vendorId": "0x544E",
-    "productId": "0x7033",
-    "matrix": {
-        "rows": 8,
-        "cols": 7
-    },
-    "layouts": {
-        "keymap": [
-            [{
-                    "y": 1,
-                    "x": 3.5
-                },
-                "0,3",
-                {
-                    "x": 10.5
-                },
-                "4,3"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 2.5
-                },
-                "0,2",
-                {
-                    "x": 1
-                },
-                "0,4",
-                {
-                    "x": 8.5
-                },
-                "4,4",
-                {
-                    "x": 1
-                },
-                "4,2"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 5.5
-                },
-                "0,5",
-                {
-                    "x": 6.5
-                },
-                "4,5"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 1.5
-                },
-                "0,1",
-                {
-                    "x": 14.5
-                },
-                "4,1",
-                "4,0"
-            ],
-            [{
-                    "y": -0.995,
-                    "x": 0.5,
-                    "c": "#aaaaaa"
-                },
-                "0,0"
-            ],
-            [{
-                    "y": -0.88,
-                    "x": 6.5,
-                    "c": "#cccccc"
-                },
-                "0,6",
-                {
-                    "x": 4.5
-                },
-                "4,6"
-            ],
-            [{
-                    "y": -0.5,
-                    "x": 3.5
-                },
-                "1,3",
-                {
-                    "x": 10.5
-                },
-                "5,3"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 2.5
-                },
-                "1,2",
-                {
-                    "x": 1
-                },
-                "1,4",
-                {
-                    "x": 8.5
-                },
-                "5,4",
-                {
-                    "x": 1
-                },
-                "5,2"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 5.5
-                },
-                "1,5",
-                {
-                    "x": 6.5
-                },
-                "5,5"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 1.5
-                },
-                "1,1",
-                {
-                    "x": 14.5
-                },
-                "5,1",
-                "5,0"
-            ],
-            [{
-                    "y": -0.995,
-                    "x": 0.5,
-                    "c": "#aaaaaa"
-                },
-                "1,0"
-            ],
-            [{
-                    "y": -0.88,
-                    "x": 6.5,
-                    "c": "#cccccc"
-                },
-                "1,6",
-                {
-                    "x": 4.5
-                },
-                "5,6"
-            ],
-            [{
-                    "y": -0.5,
-                    "x": 3.5
-                },
-                "2,3",
-                {
-                    "x": 10.5
-                },
-                "6,3"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 2.5
-                },
-                "2,2",
-                {
-                    "x": 1
-                },
-                "2,4",
-                {
-                    "x": 8.5
-                },
-                "6,4",
-                {
-                    "x": 1
-                },
-                "6,2"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 5.5
-                },
-                "2,5",
-                {
-                    "x": 6.5
-                },
-                "6,5"
-            ],
-            [{
-                    "y": -0.875,
-                    "x": 1.5
-                },
-                "2,1",
-                {
-                    "x": 14.5
-                },
-                "6,1",
-                {
-                    "c": "#777777"
-                },
-                "6,0"
-            ],
-            [{
-                    "y": -0.995,
-                    "x": 0.5
-                },
-                "2,0"
-            ],
-            [{
-                    "y": 0.25,
-                    "x": 15
-                },
-                "7,3"
-            ],
-            [{
-                    "rx": 4,
-                    "ry": 15,
-                    "y": -10.37,
-                    "x": -0.5
-                },
-                "3,3"
-            ],
-            [{
-                    "r": 6,
-                    "y": -1,
-                    "x": -0.5,
-                    "c": "#aaaaaa"
-                },
-                "3,4"
-            ],
-            [{
-                    "r": 12,
-                    "y": -1,
-                    "x": -0.5,
-                    "c": "#777777"
-                },
-                "3,5"
-            ],
-            [{
-                    "r": 15,
-                    "rx": 6.5,
-                    "ry": 4.25,
-                    "y": -0.5,
-                    "c": "#aaaaaa"
-                },
-                "2,6"
-            ],
-            [{
-                    "r": 18,
-                    "rx": 4,
-                    "ry": 15,
-                    "y": -10.37,
-                    "x": -0.5,
-                    "c": "#cccccc"
-                },
-                "3,6"
-            ],
-            [{
-                    "r": -18,
-                    "rx": 15.5,
-                    "y": -10.37,
-                    "x": -0.5
-                },
-                "7,6"
-            ],
-            [{
-                    "r": -15,
-                    "rx": 13,
-                    "ry": 4.25,
-                    "y": -0.5,
-                    "x": -1,
-                    "c": "#aaaaaa"
-                },
-                "6,6"
-            ],
-            [{
-                    "r": -12,
-                    "rx": 15.5,
-                    "ry": 15,
-                    "y": -10.37,
-                    "x": -0.5,
-                    "c": "#777777"
-                },
-                "7,5"
-            ],
-            [{
-                    "r": -6,
-                    "y": -1,
-                    "x": -0.5,
-                    "c": "#aaaaaa"
-                },
-                "7,4"
-            ]
-        ]
-    }
-}
\ No newline at end of file
+  "name": "Pinky3",
+  "vendorId": "0x544E",
+  "productId": "0x7033",
+  "matrix": {
+    "rows": 8,
+    "cols": 7
+  },
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "y": 1,
+          "x": 3.5
+        },
+        "0,3",
+        {
+          "x": 10.5
+        },
+        "4,3"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 2.5
+        },
+        "0,2",
+        {
+          "x": 1
+        },
+        "0,4",
+        {
+          "x": 8.5
+        },
+        "4,4",
+        {
+          "x": 1
+        },
+        "4,2"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 5.5
+        },
+        "0,5",
+        {
+          "x": 6.5
+        },
+        "4,5"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 1.5
+        },
+        "0,1",
+        {
+          "x": 14.5
+        },
+        "4,1",
+        "4,0"
+      ],
+      [
+        {
+          "y": -0.995,
+          "x": 0.5,
+          "c": "#aaaaaa"
+        },
+        "0,0"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 6.5,
+          "c": "#cccccc"
+        },
+        "0,6",
+        {
+          "x": 4.5
+        },
+        "4,6"
+      ],
+      [
+        {
+          "y": -0.5,
+          "x": 3.5
+        },
+        "1,3",
+        {
+          "x": 10.5
+        },
+        "5,3"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 2.5
+        },
+        "1,2",
+        {
+          "x": 1
+        },
+        "1,4",
+        {
+          "x": 8.5
+        },
+        "5,4",
+        {
+          "x": 1
+        },
+        "5,2"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 5.5
+        },
+        "1,5",
+        {
+          "x": 6.5
+        },
+        "5,5"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 1.5
+        },
+        "1,1",
+        {
+          "x": 14.5
+        },
+        "5,1",
+        "5,0"
+      ],
+      [
+        {
+          "y": -0.995,
+          "x": 0.5,
+          "c": "#aaaaaa"
+        },
+        "1,0"
+      ],
+      [
+        {
+          "y": -0.88,
+          "x": 6.5,
+          "c": "#cccccc"
+        },
+        "1,6",
+        {
+          "x": 4.5
+        },
+        "5,6"
+      ],
+      [
+        {
+          "y": -0.5,
+          "x": 3.5
+        },
+        "2,3",
+        {
+          "x": 10.5
+        },
+        "6,3"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 2.5
+        },
+        "2,2",
+        {
+          "x": 1
+        },
+        "2,4",
+        {
+          "x": 8.5
+        },
+        "6,4",
+        {
+          "x": 1
+        },
+        "6,2"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 5.5
+        },
+        "2,5",
+        {
+          "x": 6.5
+        },
+        "6,5"
+      ],
+      [
+        {
+          "y": -0.875,
+          "x": 1.5
+        },
+        "2,1",
+        {
+          "x": 14.5
+        },
+        "6,1",
+        {
+          "c": "#777777"
+        },
+        "6,0"
+      ],
+      [
+        {
+          "y": -0.995,
+          "x": 0.5
+        },
+        "2,0"
+      ],
+      [
+        {
+          "y": 0.25,
+          "x": 15
+        },
+        "7,3"
+      ],
+      [
+        {
+          "rx": 4,
+          "ry": 15,
+          "y": -10.37,
+          "x": -0.5
+        },
+        "3,3"
+      ],
+      [
+        {
+          "r": 6,
+          "y": -1,
+          "x": -0.5,
+          "c": "#aaaaaa"
+        },
+        "3,4"
+      ],
+      [
+        {
+          "r": 12,
+          "y": -1,
+          "x": -0.5,
+          "c": "#777777"
+        },
+        "3,5"
+      ],
+      [
+        {
+          "r": 15,
+          "rx": 6.5,
+          "ry": 4.25,
+          "y": -0.5,
+          "c": "#aaaaaa"
+        },
+        "2,6"
+      ],
+      [
+        {
+          "r": 18,
+          "rx": 4,
+          "ry": 15,
+          "y": -10.37,
+          "x": -0.5,
+          "c": "#cccccc"
+        },
+        "3,6"
+      ],
+      [
+        {
+          "r": -18,
+          "rx": 15.5,
+          "y": -10.37,
+          "x": -0.5
+        },
+        "7,6"
+      ],
+      [
+        {
+          "r": -15,
+          "rx": 13,
+          "ry": 4.25,
+          "y": -0.5,
+          "x": -1,
+          "c": "#aaaaaa"
+        },
+        "6,6"
+      ],
+      [
+        {
+          "r": -12,
+          "rx": 15.5,
+          "ry": 15,
+          "y": -10.37,
+          "x": -0.5,
+          "c": "#777777"
+        },
+        "7,5"
+      ],
+      [
+        {
+          "r": -6,
+          "y": -1,
+          "x": -0.5,
+          "c": "#aaaaaa"
+        },
+        "7,4"
+      ]
+    ]
+  }
+}
diff --git a/v3/syenakeyboards/elaruus/elaruus.json b/v3/syenakeyboards/elaruus/elaruus.json
index d34c7f3322..43923477a0 100644
--- a/v3/syenakeyboards/elaruus/elaruus.json
+++ b/v3/syenakeyboards/elaruus/elaruus.json
@@ -1,18 +1,12 @@
 {
-    "name": "SyenaKeyboards Elaruus",
-    "vendorId": "0x5373",
-    "productId": "0x6172",
-    "matrix": {
-      "cols": 2,
-      "rows": 1
-    },
-    "layouts": {
-      "keymap": [
-        [
-          "0,0",
-          "0,1"
-        ]
-      ]
-    }
+  "name": "SyenaKeyboards Elaruus",
+  "vendorId": "0x5373",
+  "productId": "0x6172",
+  "matrix": {
+    "rows": 1,
+    "cols": 2
+  },
+  "layouts": {
+    "keymap": [["0,0", "0,1"]]
   }
-  
\ No newline at end of file
+}