diff --git a/v3/han60/han60.json b/v3/han60/han60.json
index 68c6b264dc..ff584ef129 100644
--- a/v3/han60/han60.json
+++ b/v3/han60/han60.json
@@ -9,29 +9,20 @@
   "layouts": {
     "labels": [
       "Split Backspace",
+      "ISO Enter",
+      "ISO Left Shift",
+      "Arrows Right Shift",
       [
-        "ANSI/ISO",
-        "ANSI",
-        "ISO"
-      ],
-      "Split Left Shift",
-      [
-        "Bottom Right Cluster",
-        "Standard",
-        "Arrow Keys"
+        "Bottom Row",
+        "Tsangan",
+        "WKL",
+        "HHKB",
+        "Tsangan Arrow"
       ]
     ],
     "keymap": [
       [
         {
-          "x": 15.5
-        },
-        "0,13\n\n\n0,1",
-        "2,13\n\n\n0,1"
-      ],
-      [
-        {
-          "y": 0.25,
           "x": 2.5,
           "c": "#777777"
         },
@@ -55,11 +46,18 @@
           "c": "#aaaaaa",
           "w": 2
         },
-        "0,13\n\n\n0,0"
+        "0,13\n\n\n0,0",
+        {
+          "x": 0.25,
+          "c": "#cccccc"
+        },
+        "0,13\n\n\n0,1",
+        "2,13\n\n\n0,1"
       ],
       [
         {
           "x": 2.5,
+          "c": "#aaaaaa",
           "w": 1.5
         },
         "1,0",
@@ -115,7 +113,7 @@
         "2,10",
         "2,11",
         {
-          "c": "#aaaaaa",
+          "c": "#777777",
           "w": 2.25
         },
         "2,12\n\n\n1,0",
@@ -131,9 +129,13 @@
           "w": 1.25
         },
         "3,0\n\n\n2,1",
+        {
+          "c": "#cccccc"
+        },
         "4,0\n\n\n2,1",
         {
           "x": 0.25,
+          "c": "#aaaaaa",
           "w": 2.25
         },
         "3,0\n\n\n2,0",
@@ -154,19 +156,33 @@
           "c": "#aaaaaa",
           "w": 2.75
         },
-        "3,11\n\n\n3,0"
+        "3,11\n\n\n3,0",
+        {
+          "x": 0.25,
+          "w": 1.75
+        },
+        "3,11\n\n\n3,1",
+        {
+          "c": "#777777"
+        },
+        "3,13\n\n\n3,1",
+        {
+          "c": "#cccccc"
+        },
+        "4,13\n\n\n3,1"
       ],
       [
         {
           "x": 2.5,
+          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,1",
-        "4,2",
+        "4,1\n\n\n4,0",
+        "4,2\n\n\n4,0",
         {
           "w": 1.5
         },
-        "4,3",
+        "4,3\n\n\n4,0",
         {
           "c": "#cccccc",
           "w": 7
@@ -176,41 +192,76 @@
           "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,7\n\n\n3,0",
-        "4,9\n\n\n3,0",
+        "4,7\n\n\n4,0",
+        "4,9\n\n\n4,0",
         {
           "w": 1.5
         },
-        "4,11\n\n\n3,0"
+        "4,11\n\n\n4,0"
       ],
       [
         {
           "y": 0.25,
-          "x": 13.75,
-          "w": 1.75
+          "x": 2.5,
+          "w": 1.5
         },
-        "3,11\n\n\n3,1",
+        "4,1\n\n\n4,1",
         {
-          "c": "#777777"
+          "x": 1,
+          "w": 1.5
         },
-        "3,13\n\n\n3,1",
+        "4,3\n\n\n4,1",
         {
-          "c": "#cccccc"
+          "x": 7,
+          "w": 1.5
         },
-        "4,13\n\n\n3,1"
+        "4,7\n\n\n4,1",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "4,11\n\n\n4,1"
       ],
       [
         {
-          "x": 13.5,
-          "c": "#aaaaaa"
+          "x": 2.5,
+          "w": 1.5,
+          "d": true
+        },
+        "\n\n\n4,2",
+        "4,2\n\n\n4,2",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n4,2",
+        {
+          "x": 7,
+          "w": 1.5
+        },
+        "4,7\n\n\n4,2",
+        "4,9\n\n\n4,2"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "4,1\n\n\n4,3",
+        "4,2\n\n\n4,3",
+        {
+          "w": 1.5
+        },
+        "4,3\n\n\n4,3",
+        {
+          "x": 7
         },
-        "4,7\n\n\n3,1",
+        "4,7\n\n\n4,3",
         {
           "c": "#777777"
         },
-        "4,8\n\n\n3,1",
-        "4,10\n\n\n3,1",
-        "4,12\n\n\n3,1"
+        "4,8\n\n\n4,3",
+        "4,10\n\n\n4,3",
+        "4,12\n\n\n4,3"
       ]
     ]
   }