diff --git a/v3/dztech/dz60v2/dz60v2.json b/v3/dztech/dz60v2/dz60v2.json
index 716c3ec649..f4ba583ed9 100644
--- a/v3/dztech/dz60v2/dz60v2.json
+++ b/v3/dztech/dz60v2/dz60v2.json
@@ -18,58 +18,37 @@
       "ISO Enter",
       [
         "Row 4",
-        "Default",
-        "Split right shift",
-        "Arrows",
-        "Default ISO",
-        "ISO split right shift",
-        "ISO arrows",
-        "[2U] Default",
-        "[2U] Split left shift",
-        "[2U] Split right shift",
-        "[2U] Split both shifts"
+        "ANSI",
+        "ANSI Tsangan",
+        "ANSI Arrows",
+        "ISO",
+        "ISO Tsangan",
+        "ISO Arrows",
+        "64-key ANSI",
+        "64-key ANSI 2u Right",
+        "64-key ISO",
+        "64-key ISO 2u Right"
       ],
       [
-        "Bottom row",
-        "6.25U",
-        "7U",
-        "6.25U Arrows",
-        "6.25U Arrows B",
-        "7U Arrows",
-        "Split space",
-        "Split space arrows"
+        "Row 5",
+        "Standard",
+        "Arrows",
+        "2x1.5u-2x1u",
+        "Split Standard",
+        "Split Arrows",
+        "Split 2x1.5u-2x1u",
+        "Tsangan",
+        "WKL",
+        "HHKB",
+        "Tsangan Arrows",
+        "LWKL Standard",
+        "LWKL Arrows",
+        "LWKL 2x1.5u-2x1u"
       ]
     ],
-    "presets": {
-      "Default": [
-        0,
-        0,
-        0,
-        0
-      ],
-      "ISO": [
-        0,
-        1,
-        3,
-        0
-      ],
-      "HHKB": [
-        0,
-        0,
-        0,
-        2
-      ],
-      "With arrows": [
-        0,
-        0,
-        3,
-        3
-      ]
-    },
     "keymap": [
       [
         {
-          "x": 2.5,
           "c": "#777777"
         },
         "0,0",
@@ -102,7 +81,6 @@
       ],
       [
         {
-          "x": 2.5,
           "c": "#aaaaaa",
           "w": 1.5
         },
@@ -139,7 +117,6 @@
       ],
       [
         {
-          "x": 2.5,
           "c": "#aaaaaa",
           "w": 1.75
         },
@@ -171,7 +148,6 @@
       ],
       [
         {
-          "x": 2.5,
           "c": "#aaaaaa",
           "w": 2.25
         },
@@ -197,7 +173,6 @@
       ],
       [
         {
-          "x": 2.5,
           "w": 1.25
         },
         "4,0\n\n\n3,0",
@@ -234,8 +209,7 @@
       ],
       [
         {
-          "y": 0.5,
-          "x": 2.5,
+          "y": 0.25,
           "w": 2.25
         },
         "3,0\n\n\n2,1",
@@ -261,7 +235,6 @@
       ],
       [
         {
-          "x": 2.5,
           "w": 2.25
         },
         "3,0\n\n\n2,2",
@@ -276,19 +249,30 @@
         "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,10\n\n\n2,2",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,12\n\n\n2,2",
+        {
+          "c": "#777777"
+        },
+        "3,13\n\n\n2,2",
+        {
+          "c": "#aaaaaa"
+        },
+        "3,14\n\n\n2,2"
       ],
       [
         {
-          "x": 2.5,
-          "c": "#aaaaaa",
           "w": 1.25
         },
         "3,0\n\n\n2,3",
-        "3,1\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",
@@ -307,14 +291,13 @@
       ],
       [
         {
-          "x": 2.5,
           "w": 1.25
         },
         "3,0\n\n\n2,4",
-        "3,1\n\n\n2,4",
         {
           "c": "#cccccc"
         },
+        "3,1\n\n\n2,4",
         "3,2\n\n\n2,4",
         "3,3\n\n\n2,4",
         "3,4\n\n\n2,4",
@@ -334,14 +317,13 @@
       ],
       [
         {
-          "x": 2.5,
           "w": 1.25
         },
         "3,0\n\n\n2,5",
-        "3,1\n\n\n2,5",
         {
           "c": "#cccccc"
         },
+        "3,1\n\n\n2,5",
         "3,2\n\n\n2,5",
         "3,3\n\n\n2,5",
         "3,4\n\n\n2,5",
@@ -350,13 +332,23 @@
         "3,7\n\n\n2,5",
         "3,8\n\n\n2,5",
         "3,9\n\n\n2,5",
-        "3,10\n\n\n2,5"
+        "3,10\n\n\n2,5",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,12\n\n\n2,5",
+        {
+          "c": "#777777"
+        },
+        "3,13\n\n\n2,5",
+        {
+          "c": "#aaaaaa"
+        },
+        "3,14\n\n\n2,5"
       ],
       [
         {
-          "y": 0.25,
-          "x": 2.5,
-          "c": "#aaaaaa",
           "w": 2
         },
         "3,0\n\n\n2,6",
@@ -373,19 +365,24 @@
         "3,9\n\n\n2,6",
         "3,10\n\n\n2,6",
         "3,11\n\n\n2,6",
+        {
+          "c": "#aaaaaa"
+        },
         "3,12\n\n\n2,6",
         {
-          "c": "#aaaaaa",
-          "w": 2
+          "c": "#777777"
+        },
+        "3,13\n\n\n2,6",
+        {
+          "c": "#aaaaaa"
         },
-        "3,13\n\n\n2,6"
+        "3,14\n\n\n2,6"
       ],
       [
         {
-          "x": 2.5
+          "w": 2
         },
         "3,0\n\n\n2,7",
-        "3,1\n\n\n2,7",
         {
           "c": "#cccccc"
         },
@@ -407,14 +404,11 @@
         "3,13\n\n\n2,7"
       ],
       [
-        {
-          "x": 2.5,
-          "w": 2
-        },
         "3,0\n\n\n2,8",
         {
           "c": "#cccccc"
         },
+        "3,1\n\n\n2,8",
         "3,2\n\n\n2,8",
         "3,3\n\n\n2,8",
         "3,4\n\n\n2,8",
@@ -425,22 +419,25 @@
         "3,9\n\n\n2,8",
         "3,10\n\n\n2,8",
         "3,11\n\n\n2,8",
-        "3,12\n\n\n2,8",
         {
           "c": "#aaaaaa"
         },
+        "3,12\n\n\n2,8",
+        {
+          "c": "#777777"
+        },
         "3,13\n\n\n2,8",
+        {
+          "c": "#aaaaaa"
+        },
         "3,14\n\n\n2,8"
       ],
       [
-        {
-          "x": 2.5
-        },
         "3,0\n\n\n2,9",
-        "3,1\n\n\n2,9",
         {
           "c": "#cccccc"
         },
+        "3,1\n\n\n2,9",
         "3,2\n\n\n2,9",
         "3,3\n\n\n2,9",
         "3,4\n\n\n2,9",
@@ -453,42 +450,45 @@
         "3,11\n\n\n2,9",
         "3,12\n\n\n2,9",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 2
         },
-        "3,13\n\n\n2,9",
-        "3,14\n\n\n2,9"
+        "3,13\n\n\n2,9"
       ],
       [
         {
-          "y": 0.5,
-          "x": 2.5,
-          "w": 1.5
+          "y": 0.25,
+          "w": 1.25
         },
         "4,0\n\n\n3,1",
+        {
+          "w": 1.25
+        },
         "4,1\n\n\n3,1",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,3\n\n\n3,1",
         {
           "c": "#cccccc",
-          "w": 7
+          "w": 6.25
         },
         "4,6\n\n\n3,1",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "c": "#aaaaaa"
         },
+        "4,10\n\n\n3,1",
         "4,11\n\n\n3,1",
-        "4,13\n\n\n3,1",
         {
-          "w": 1.5
+          "c": "#777777"
         },
+        "4,12\n\n\n3,1",
+        "4,13\n\n\n3,1",
         "4,14\n\n\n3,1"
       ],
       [
         {
-          "x": 2.5,
+          "c": "#aaaaaa",
           "w": 1.25
         },
         "4,0\n\n\n3,2",
@@ -506,20 +506,25 @@
         },
         "4,6\n\n\n3,2",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.5
         },
         "4,10\n\n\n3,2",
-        "4,11\n\n\n3,2",
+        {
+          "w": 1.5
+        },
         "4,12\n\n\n3,2",
         "4,13\n\n\n3,2",
         "4,14\n\n\n3,2"
       ],
       [
         {
-          "x": 2.5,
-          "w": 1.5
+          "w": 1.25
         },
         "4,0\n\n\n3,3",
+        {
+          "w": 1.25
+        },
         "4,1\n\n\n3,3",
         {
           "w": 1.25
@@ -527,45 +532,76 @@
         "4,3\n\n\n3,3",
         {
           "c": "#cccccc",
-          "w": 6.25
+          "w": 2.25
+        },
+        "4,4\n\n\n3,3",
+        {
+          "w": 1.25
         },
         "4,6\n\n\n3,3",
         {
-          "c": "#aaaaaa"
+          "w": 2.75
+        },
+        "4,8\n\n\n3,3",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
         },
         "4,10\n\n\n3,3",
+        {
+          "w": 1.25
+        },
         "4,11\n\n\n3,3",
-        "4,12\n\n\n3,3",
+        {
+          "w": 1.25
+        },
         "4,13\n\n\n3,3",
+        {
+          "w": 1.25
+        },
         "4,14\n\n\n3,3"
       ],
       [
         {
-          "x": 2.5,
-          "w": 1.5
+          "w": 1.25
         },
         "4,0\n\n\n3,4",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,1\n\n\n3,4",
+        {
+          "w": 1.25
+        },
+        "4,3\n\n\n3,4",
         {
           "c": "#cccccc",
-          "w": 7
+          "w": 2.25
+        },
+        "4,4\n\n\n3,4",
+        {
+          "w": 1.25
         },
         "4,6\n\n\n3,4",
+        {
+          "w": 2.75
+        },
+        "4,8\n\n\n3,4",
         {
           "c": "#aaaaaa"
         },
         "4,10\n\n\n3,4",
         "4,11\n\n\n3,4",
+        {
+          "c": "#777777"
+        },
         "4,12\n\n\n3,4",
         "4,13\n\n\n3,4",
         "4,14\n\n\n3,4"
       ],
       [
         {
-          "x": 2.5,
+          "c": "#aaaaaa",
           "w": 1.25
         },
         "4,0\n\n\n3,5",
@@ -592,78 +628,252 @@
         "4,8\n\n\n3,5",
         {
           "c": "#aaaaaa",
-          "w": 1.25
+          "w": 1.5
         },
         "4,10\n\n\n3,5",
         {
-          "w": 1.25
+          "w": 1.5
         },
-        "4,11\n\n\n3,5",
+        "4,12\n\n\n3,5",
+        "4,13\n\n\n3,5",
+        "4,14\n\n\n3,5"
+      ],
+      [
         {
-          "w": 1.25
+          "w": 1.5
         },
-        "4,13\n\n\n3,5",
+        "4,0\n\n\n3,6",
+        "4,1\n\n\n3,6",
         {
-          "w": 1.25
+          "w": 1.5
         },
-        "4,14\n\n\n3,5"
+        "4,3\n\n\n3,6",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n3,6",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n3,6",
+        "4,13\n\n\n3,6",
+        {
+          "w": 1.5
+        },
+        "4,14\n\n\n3,6"
       ],
       [
         {
-          "x": 2.5,
-          "w": 1.25
+          "w": 1.5
         },
-        "4,0\n\n\n3,6",
+        "4,0\n\n\n3,7",
         {
-          "w": 1.25
+          "x": 1,
+          "w": 1.5
         },
-        "4,1\n\n\n3,6",
+        "4,3\n\n\n3,7",
         {
-          "w": 1.25
+          "c": "#cccccc",
+          "w": 7
         },
-        "4,3\n\n\n3,6",
+        "4,6\n\n\n3,7",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n3,7",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "4,14\n\n\n3,7"
+      ],
+      [
+        {
+          "w": 1.5,
+          "d": true
+        },
+        "\n\n\n3,8",
+        "4,1\n\n\n3,8",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n3,8",
         {
           "c": "#cccccc",
-          "w": 2.25
+          "w": 7
         },
-        "4,4\n\n\n3,6",
+        "4,6\n\n\n3,8",
         {
-          "w": 1.25
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "4,6\n\n\n3,6",
+        "4,11\n\n\n3,8",
+        "4,13\n\n\n3,8"
+      ],
+      [
         {
-          "w": 2.75
+          "w": 1.5
+        },
+        "4,0\n\n\n3,9",
+        "4,1\n\n\n3,9",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n3,9",
+        {
+          "c": "#cccccc",
+          "w": 7
         },
-        "4,8\n\n\n3,6",
+        "4,6\n\n\n3,9",
         {
           "c": "#aaaaaa"
         },
-        "4,10\n\n\n3,6",
-        "4,11\n\n\n3,6",
-        "4,12\n\n\n3,6",
-        "4,13\n\n\n3,6",
-        "4,14\n\n\n3,6"
+        "4,11\n\n\n3,9",
+        {
+          "c": "#777777"
+        },
+        "4,12\n\n\n3,9",
+        "4,13\n\n\n3,9",
+        "4,14\n\n\n3,9"
       ],
       [
         {
-          "rx": 0.25,
-          "y": 6.5,
-          "x": 13.5,
-          "w": 1.75
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "3,12\n\n\n2,2",
-        "3,13\n\n\n2,2",
-        "3,14\n\n\n2,2"
+        "4,0\n\n\n3,10",
+        "4,1\n\n\n3,10",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n3,10",
+        {
+          "c": "#cccccc",
+          "w": 6
+        },
+        "4,6\n\n\n3,10",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n3,10",
+        "4,11\n\n\n3,10",
+        "4,13\n\n\n3,10",
+        {
+          "w": 1.5
+        },
+        "4,14\n\n\n3,10"
       ],
       [
         {
-          "y": 2,
-          "x": 13.5,
-          "w": 1.75
+          "w": 1.5,
+          "d": true
         },
-        "3,12\n\n\n2,5",
-        "3,13\n\n\n2,5",
-        "3,14\n\n\n2,5"
+        "\n\n\n3,11",
+        "4,1\n\n\n3,11",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n3,11",
+        {
+          "c": "#cccccc",
+          "w": 6
+        },
+        "4,6\n\n\n3,11",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n3,11",
+        "4,11\n\n\n3,11"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "4,0\n\n\n3,12",
+        {
+          "w": 1.5
+        },
+        "4,1\n\n\n3,12",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n3,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,10\n\n\n3,12",
+        {
+          "w": 1.25
+        },
+        "4,11\n\n\n3,12",
+        {
+          "w": 1.25
+        },
+        "4,13\n\n\n3,12",
+        {
+          "w": 1.25
+        },
+        "4,14\n\n\n3,12"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "4,0\n\n\n3,13",
+        {
+          "w": 1.5
+        },
+        "4,1\n\n\n3,13",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n3,13",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,10\n\n\n3,13",
+        "4,11\n\n\n3,13",
+        {
+          "c": "#777777"
+        },
+        "4,12\n\n\n3,13",
+        "4,13\n\n\n3,13",
+        "4,14\n\n\n3,13"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,0\n\n\n3,14",
+        {
+          "w": 1.5
+        },
+        "4,1\n\n\n3,14",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n3,14",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n3,14",
+        {
+          "w": 1.5
+        },
+        "4,12\n\n\n3,14",
+        "4,13\n\n\n3,14",
+        "4,14\n\n\n3,14"
       ]
     ]
   }