diff --git a/v3/do60/do60.json b/v3/do60/do60.json
index 9ee1b087ca..ddf0428bc3 100644
--- a/v3/do60/do60.json
+++ b/v3/do60/do60.json
@@ -122,8 +122,8 @@
         "Shift Row",
         "ANSI",
         "ISO",
-        "64 key ANSI",
-        "64 key ISO"
+        "64-key ANSI",
+        "64-key ISO"
       ],
       [
         "RShift Cluster",
@@ -131,32 +131,105 @@
         "1.75u-1u",
         "1u-1.75u",
         "Arrows",
-        "64 Key"
+        "64-Key"
       ],
       [
-        "Bottom Row",
+        "Left Mods",
+        "3x1.25u",
+        "Tsangan",
+        "WKL",
+        "HHKB",
+        "2x1.5u"
+      ],
+      [
+        "Spacebar",
         "6.25u",
         "Split 6.25u",
-        "6.25u Arrows",
-        "Split 6.25u Arrows",
+        "Chiwi",
+        "Chiwi Alternative",
+        "Tsangan",
+        "6u",
+        "Split 6u",
+        "Left 7u"
+      ],
+      [
+        "Right Mods",
+        "4x1.25u",
+        "5x1u",
         "Chiwi",
         "Chiwi Alternative",
         "Tsangan",
         "WKL",
-        "HKKB (7u)",
-        "Tsangan Arrow",
+        "7u HHKB",
+        "4x1u",
         "Infinity",
-        "Split Infinity",
-        "HHKB",
-        "Split HHKB",
-        "LWKL",
-        "LWKL Infinity",
-        "LWKL Arrows"
+        "HHKB"
       ]
     ],
     "keymap": [
       [
         {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "3,0\n\n\n2,1",
+        {
+          "c": "#cccccc"
+        },
+        "3,1\n\n\n2,1",
+        "3,2\n\n\n2,1",
+        "3,3\n\n\n2,1",
+        "3,4\n\n\n2,1",
+        "3,5\n\n\n2,1",
+        "3,6\n\n\n2,1",
+        "3,7\n\n\n2,1",
+        "3,8\n\n\n2,1",
+        "3,9\n\n\n2,1",
+        "3,10\n\n\n2,1"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "3,0\n\n\n2,2",
+        {
+          "c": "#cccccc"
+        },
+        "3,2\n\n\n2,2",
+        "3,3\n\n\n2,2",
+        "3,4\n\n\n2,2",
+        "3,5\n\n\n2,2",
+        "3,6\n\n\n2,2",
+        "3,7\n\n\n2,2",
+        "3,8\n\n\n2,2",
+        "3,9\n\n\n2,2",
+        "3,10\n\n\n2,2",
+        "3,11\n\n\n2,2"
+      ],
+      [
+        {
+          "c": "#aaaaaa"
+        },
+        "3,0\n\n\n2,3",
+        {
+          "c": "#cccccc"
+        },
+        "3,1\n\n\n2,3",
+        "3,2\n\n\n2,3",
+        "3,3\n\n\n2,3",
+        "3,4\n\n\n2,3",
+        "3,5\n\n\n2,3",
+        "3,6\n\n\n2,3",
+        "3,7\n\n\n2,3",
+        "3,8\n\n\n2,3",
+        "3,9\n\n\n2,3",
+        "3,10\n\n\n2,3",
+        "3,11\n\n\n2,3"
+      ],
+      [
+        {
+          "y": 0.25,
           "c": "#777777"
         },
         "0,0",
@@ -294,8 +367,8 @@
         },
         "3,13\n\n\n3,0",
         {
-          "c": "#cccccc",
-          "x": 0.25
+          "x": 0.25,
+          "c": "#cccccc"
         },
         "3,11\n\n\n3,1",
         {
@@ -305,8 +378,8 @@
         "3,13\n\n\n3,1",
         "3,14\n\n\n3,1",
         {
-          "c": "#cccccc",
-          "x": 0.25
+          "x": 0.25,
+          "c": "#cccccc"
         },
         "3,11\n\n\n3,2",
         "3,13\n\n\n3,2",
@@ -345,583 +418,371 @@
         },
         "4,0\n\n\n4,0",
         {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,0",
-        {
-          "w": 1.25
-        },
-        "4,2\n\n\n4,0",
-        {
+          "x": -1.25,
           "c": "#cccccc",
-          "w": 6.25
-        },
-        "4,6\n\n\n4,0",
-        {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,10\n\n\n4,0",
-        {
-          "w": 1.25
-        },
-        "4,11\n\n\n4,0",
-        {
-          "w": 1.25
-        },
-        "4,12\n\n\n4,0",
-        {
-          "w": 1.25
-        },
-        "4,14\n\n\n4,0"
-      ],
-      [
-        {
-          "y": 0.25,
-          "w": 1.25
-        },
-        "3,0\n\n\n2,1",
-        {
-          "c": "#cccccc"
-        },
-        "3,1\n\n\n2,1",
-        "3,2\n\n\n2,1",
-        "3,3\n\n\n2,1",
-        "3,4\n\n\n2,1",
-        "3,5\n\n\n2,1",
-        "3,6\n\n\n2,1",
-        "3,7\n\n\n2,1",
-        "3,8\n\n\n2,1",
-        "3,9\n\n\n2,1",
-        "3,10\n\n\n2,1"
-      ],
-      [
-        {
-          "c": "#aaaaaa",
-          "w": 2
-        },
-        "3,0\n\n\n2,2",
-        {
-          "c": "#cccccc"
+          "a": 7,
+          "w": 10,
+          "d": true
         },
-        "3,2\n\n\n2,2",
-        "3,3\n\n\n2,2",
-        "3,4\n\n\n2,2",
-        "3,5\n\n\n2,2",
-        "3,6\n\n\n2,2",
-        "3,7\n\n\n2,2",
-        "3,8\n\n\n2,2",
-        "3,9\n\n\n2,2",
-        "3,10\n\n\n2,2",
-        "3,11\n\n\n2,2"
-      ],
-      [
+        "",
         {
-          "c": "#aaaaaa"
-        },
-        "3,0\n\n\n2,3",
-        {
-          "c": "#cccccc"
+          "x": -10,
+          "a": 4,
+          "w": 3.75,
+          "d": true
         },
-        "3,1\n\n\n2,3",
-        "3,2\n\n\n2,3",
-        "3,3\n\n\n2,3",
-        "3,4\n\n\n2,3",
-        "3,5\n\n\n2,3",
-        "3,6\n\n\n2,3",
-        "3,7\n\n\n2,3",
-        "3,8\n\n\n2,3",
-        "3,9\n\n\n2,3",
-        "3,10\n\n\n2,3",
-        "3,11\n\n\n2,3"
-      ],
-      [
+        "\n\n\n5,0",
         {
-          "y": 0.25,
+          "x": -2.5,
           "c": "#aaaaaa",
           "w": 1.25
         },
-        "4,0\n\n\n4,1",
-        {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,1",
+        "4,1\n\n\n4,0",
         {
           "w": 1.25
         },
-        "4,2\n\n\n4,1",
+        "4,2\n\n\n4,0",
         {
           "c": "#cccccc",
-          "w": 2.75
-        },
-        "4,5\n\n\n4,1",
-        {
-          "w": 1.25
+          "w": 6.25,
+          "d": true
         },
-        "4,6\n\n\n4,1",
+        "\n\n\n6,0",
         {
-          "w": 2.25
+          "x": -6.25,
+          "w": 6.25
         },
-        "4,7\n\n\n4,1",
+        "4,6\n\n\n5,0",
         {
           "c": "#aaaaaa",
           "w": 1.25
         },
-        "4,10\n\n\n4,1",
+        "4,10\n\n\n6,0",
         {
           "w": 1.25
         },
-        "4,11\n\n\n4,1",
+        "4,11\n\n\n6,0",
         {
           "w": 1.25
         },
-        "4,12\n\n\n4,1",
+        "4,12\n\n\n6,0",
         {
           "w": 1.25
         },
-        "4,14\n\n\n4,1"
+        "4,14\n\n\n6,0"
       ],
       [
-        {
-          "w": 1.25
-        },
-        "4,0\n\n\n4,2",
-        {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,2",
-        {
-          "w": 1.25
-        },
-        "4,2\n\n\n4,2",
         {
           "c": "#cccccc",
-          "w": 6.25
-        },
-        "4,6\n\n\n4,2",
-        {
-          "c": "#aaaaaa"
-        },
-        "4,10\n\n\n4,2",
-        "4,11\n\n\n4,2",
-        {
-          "c": "#777777"
-        },
-        "4,12\n\n\n4,2",
-        "4,13\n\n\n4,2",
-        "4,14\n\n\n4,2"
-      ],
-      [
-        {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,0\n\n\n4,3",
-        {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,3",
-        {
-          "w": 1.25
+          "w": 3.75,
+          "d": true
         },
-        "4,2\n\n\n4,3",
+        "\n\n\n5,1",
         {
-          "c": "#cccccc",
           "w": 2.75
         },
-        "4,5\n\n\n4,3",
+        "4,5\n\n\n5,1",
         {
           "w": 1.25
         },
-        "4,6\n\n\n4,3",
+        "4,6\n\n\n5,1",
         {
           "w": 2.25
         },
-        "4,7\n\n\n4,3",
-        {
-          "c": "#aaaaaa"
-        },
-        "4,10\n\n\n4,3",
-        "4,11\n\n\n4,3",
-        {
-          "c": "#777777"
-        },
-        "4,12\n\n\n4,3",
-        "4,13\n\n\n4,3",
-        "4,14\n\n\n4,3"
+        "4,7\n\n\n5,1"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,0\n\n\n4,4",
-        {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,4",
-        {
-          "w": 1.25
+          "w": 3.75,
+          "d": true
         },
-        "4,2\n\n\n4,4",
+        "\n\n\n5,2",
         {
-          "c": "#cccccc",
           "w": 3
         },
-        "4,5\n\n\n4,4",
+        "4,5\n\n\n5,2",
         {
           "w": 3
         },
-        "4,7\n\n\n4,4",
-        {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,10\n\n\n4,4",
-        "4,11\n\n\n4,4",
-        {
-          "c": "#777777"
-        },
-        "4,12\n\n\n4,4",
-        "4,13\n\n\n4,4",
-        "4,14\n\n\n4,4"
+        "4,7\n\n\n5,2"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,0\n\n\n4,5",
-        {
-          "w": 1.25
-        },
-        "4,1\n\n\n4,5",
-        {
-          "w": 1.25
+          "w": 3.75,
+          "d": true
         },
-        "4,2\n\n\n4,5",
+        "\n\n\n5,3",
         {
-          "c": "#cccccc",
           "w": 3
         },
-        "4,5\n\n\n4,5",
+        "4,5\n\n\n5,3",
         {
           "w": 2.75
         },
-        "4,7\n\n\n4,5",
-        {
-          "c": "#aaaaaa",
-          "w": 1.25
-        },
-        "4,10\n\n\n4,5",
+        "4,7\n\n\n5,3"
+      ],
+      [
         {
-          "w": 1.25
+          "w": 4,
+          "d": true
         },
-        "4,11\n\n\n4,5",
+        "\n\n\n5,4",
         {
-          "c": "#777777"
+          "w": 7
         },
-        "4,12\n\n\n4,5",
-        "4,13\n\n\n4,5",
-        "4,14\n\n\n4,5"
+        "4,6\n\n\n5,4"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "w": 4,
+          "d": true
         },
-        "4,0\n\n\n4,6",
-        "4,1\n\n\n4,6",
+        "\n\n\n5,5",
         {
-          "w": 1.5
+          "w": 6
         },
-        "4,2\n\n\n4,6",
+        "4,6\n\n\n5,5"
+      ],
+      [
         {
-          "c": "#cccccc",
-          "w": 7
+          "w": 4,
+          "d": true
         },
-        "4,6\n\n\n4,6",
+        "\n\n\n5,6",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "w": 3
         },
-        "4,11\n\n\n4,6",
-        "4,12\n\n\n4,6",
+        "4,5\n\n\n5,6",
         {
-          "w": 1.5
+          "w": 3
         },
-        "4,14\n\n\n4,6"
+        "4,7\n\n\n5,6"
       ],
       [
         {
-          "w": 1.5
-        },
-        "4,0\n\n\n4,7",
-        {
+          "w": 3,
           "d": true
         },
-        "4,1\n\n\n4,7",
-        {
-          "w": 1.5
-        },
-        "4,2\n\n\n4,7",
+        "\n\n\n5,7",
         {
-          "c": "#cccccc",
           "w": 7
         },
-        "4,6\n\n\n4,7",
+        "4,6\n\n\n5,7"
+      ],
+      [
         {
           "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,11\n\n\n4,7",
+        "4,0\n\n\n4,1",
+        "4,1\n\n\n4,1",
         {
-          "x": 1,
           "w": 1.5
         },
-        "4,14\n\n\n4,7"
+        "4,2\n\n\n4,1"
       ],
       [
         {
-          "w": 1.5,
-          "d": true
+          "w": 1.5
         },
-        "4,0\n\n\n4,8",
-        "4,1\n\n\n4,8",
+        "4,0\n\n\n4,2",
         {
+          "x": 1,
           "w": 1.5
         },
-        "4,2\n\n\n4,8",
+        "4,2\n\n\n4,2"
+      ],
+      [
         {
-          "c": "#cccccc",
-          "w": 7
+          "w": 1.5,
+          "d": true
         },
-        "4,6\n\n\n4,8",
+        "\n\n\n4,3",
+        "4,1\n\n\n4,3",
         {
-          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,11\n\n\n4,8",
-        "4,12\n\n\n4,8"
+        "4,2\n\n\n4,3"
       ],
       [
         {
           "w": 1.5
         },
-        "4,0\n\n\n4,9",
-        "4,1\n\n\n4,9",
+        "4,0\n\n\n4,4",
         {
           "w": 1.5
         },
-        "4,2\n\n\n4,9",
+        "4,1\n\n\n4,4",
         {
+          "x": 0.75,
           "c": "#cccccc",
-          "w": 7
+          "w": 6.25,
+          "d": true
         },
-        "4,6\n\n\n4,9",
+        "\n\n\n6,1",
         {
           "c": "#aaaaaa"
         },
-        "4,11\n\n\n4,9",
+        "4,10\n\n\n6,1",
+        "4,11\n\n\n6,1",
         {
           "c": "#777777"
         },
-        "4,12\n\n\n4,9",
-        "4,13\n\n\n4,9",
-        "4,14\n\n\n4,9"
+        "4,12\n\n\n6,1",
+        "4,13\n\n\n6,1",
+        "4,14\n\n\n6,1"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 1.5
-        },
-        "4,0\n\n\n4,10",
-        "4,1\n\n\n4,10",
-        {
-          "w": 1.5
-        },
-        "4,2\n\n\n4,10",
-        {
+          "x": 3.75,
           "c": "#cccccc",
-          "w": 6
+          "w": 6,
+          "d": true
         },
-        "4,6\n\n\n4,10",
+        "\n\n\n6,2",
         {
           "c": "#aaaaaa",
-          "w": 1.5
+          "w": 1.25
         },
-        "4,10\n\n\n4,10",
-        "4,11\n\n\n4,10",
-        "4,12\n\n\n4,10",
+        "4,10\n\n\n6,2",
+        "4,11\n\n\n6,2",
         {
-          "w": 1.5
+          "c": "#777777"
         },
-        "4,14\n\n\n4,10"
+        "4,12\n\n\n6,2",
+        "4,13\n\n\n6,2",
+        "4,14\n\n\n6,2"
       ],
       [
         {
-          "w": 1.5
-        },
-        "4,0\n\n\n4,11",
-        "4,1\n\n\n4,11",
-        {
-          "w": 1.5
-        },
-        "4,2\n\n\n4,11",
-        {
+          "x": 3.75,
           "c": "#cccccc",
-          "w": 3
+          "w": 5.75,
+          "d": true
         },
-        "4,5\n\n\n4,11",
+        "\n\n\n6,3",
         {
-          "w": 3
+          "c": "#aaaaaa",
+          "w": 1.25
         },
-        "4,7\n\n\n4,11",
+        "4,10\n\n\n6,3",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "w": 1.25
         },
-        "4,10\n\n\n4,11",
-        "4,11\n\n\n4,11",
-        "4,12\n\n\n4,11",
+        "4,11\n\n\n6,3",
         {
-          "w": 1.5
+          "c": "#777777"
         },
-        "4,14\n\n\n4,11"
+        "4,12\n\n\n6,3",
+        "4,13\n\n\n6,3",
+        "4,14\n\n\n6,3"
       ],
       [
         {
-          "w": 1.5,
+          "x": 3.75,
+          "c": "#cccccc",
+          "w": 7.25,
           "d": true
         },
-        "4,0\n\n\n4,12",
-        "4,1\n\n\n4,12",
+        "\n\n\n6,4",
         {
+          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,2\n\n\n4,12",
-        {
-          "c": "#cccccc",
-          "w": 6
-        },
-        "4,6\n\n\n4,12",
+        "4,11\n\n\n6,4",
+        "4,12\n\n\n6,4",
         {
-          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,10\n\n\n4,12",
-        "4,11\n\n\n4,12"
+        "4,14\n\n\n6,4"
       ],
       [
         {
-          "w": 1.5,
+          "x": 3.75,
+          "c": "#cccccc",
+          "w": 7.25,
           "d": true
         },
-        "4,0\n\n\n4,13",
-        "4,1\n\n\n4,13",
+        "\n\n\n6,5",
         {
+          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,2\n\n\n4,13",
+        "4,11\n\n\n6,5",
         {
-          "c": "#cccccc",
-          "w": 3
-        },
-        "4,5\n\n\n4,13",
-        {
-          "w": 3
-        },
-        "4,7\n\n\n4,13",
-        {
-          "c": "#aaaaaa",
+          "x": 1,
           "w": 1.5
         },
-        "4,10\n\n\n4,13",
-        "4,11\n\n\n4,13"
+        "4,14\n\n\n6,5"
       ],
       [
         {
-          "w": 1.5
-        },
-        "4,0\n\n\n4,14",
-        {
-          "w": 1.5
-        },
-        "4,1\n\n\n4,14",
-        {
+          "x": 3.75,
           "c": "#cccccc",
-          "w": 7
+          "w": 7.25,
+          "d": true
         },
-        "4,6\n\n\n4,14",
+        "\n\n\n6,6",
         {
           "c": "#aaaaaa",
-          "w": 1.25
+          "w": 1.5
         },
-        "4,10\n\n\n4,14",
+        "4,11\n\n\n6,6",
+        "4,12\n\n\n6,6"
+      ],
+      [
         {
-          "w": 1.25
+          "x": 3.75,
+          "c": "#cccccc",
+          "w": 7.25,
+          "d": true
         },
-        "4,11\n\n\n4,14",
+        "\n\n\n6,7",
         {
-          "w": 1.25
+          "c": "#aaaaaa"
         },
-        "4,12\n\n\n4,14",
+        "4,11\n\n\n6,7",
         {
-          "w": 1.25
+          "c": "#777777"
         },
-        "4,14\n\n\n4,14"
+        "4,12\n\n\n6,7",
+        "4,13\n\n\n6,7",
+        "4,14\n\n\n6,7"
       ],
       [
         {
-          "w": 1.5
-        },
-        "4,0\n\n\n4,15",
-        {
-          "w": 1.5
-        },
-        "4,1\n\n\n4,15",
-        {
+          "x": 3.75,
           "c": "#cccccc",
-          "w": 7
+          "w": 6.25,
+          "d": true
         },
-        "4,6\n\n\n4,15",
+        "\n\n\n6,8",
         {
           "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,10\n\n\n4,15",
-        "4,11\n\n\n4,15",
-        "4,12\n\n\n4,15",
+        "4,10\n\n\n6,8",
+        "4,11\n\n\n6,8",
+        "4,12\n\n\n6,8",
         {
           "w": 1.5
         },
-        "4,14\n\n\n4,15"
+        "4,14\n\n\n6,8"
       ],
       [
         {
-          "w": 1.5
-        },
-        "4,0\n\n\n4,16",
-        {
-          "w": 1.5
-        },
-        "4,1\n\n\n4,16",
-        {
+          "x": 3.75,
           "c": "#cccccc",
-          "w": 7
-        },
-        "4,6\n\n\n4,16",
-        {
-          "c": "#aaaaaa"
+          "w": 6.25,
+          "d": true
         },
-        "4,10\n\n\n4,16",
-        "4,11\n\n\n4,16",
+        "\n\n\n6,9",
         {
-          "c": "#777777"
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "4,12\n\n\n4,16",
-        "4,13\n\n\n4,16",
-        "4,14\n\n\n4,16"
+        "4,10\n\n\n6,9",
+        "4,11\n\n\n6,9"
       ]
     ]
   }