diff --git a/v3/YMDK/yd60mq/yd60mq.json b/v3/YMDK/yd60mq/yd60mq.json
index 398dd91b63..3fdea1f6c4 100644
--- a/v3/YMDK/yd60mq/yd60mq.json
+++ b/v3/YMDK/yd60mq/yd60mq.json
@@ -19,24 +19,31 @@
       [
         "ZXC ROW / R4",
         "ANSI",
-        "ANSI Split Right Shift",
-        "ANSI Big Question Mark Arrow Keys",
+        "ANSI Tsangan",
+        "JIS",
+        "ANSI Arrows",
         "ISO",
-        "ISO Split Right Shift",
-        "ISO Big Question Mark Arrow Keys",
-        "2u Left Shift Arrow keys",
-        "1u Left Shift ISO Arrow keys"
+        "ISO Tsangan",
+        "ABNT2",
+        "ISO Arrows",
+        "64-Key ANSI",
+        "64-Key ANSI 2u Right",
+        "64-Key ISO",
+        "64-Key ISO 2u Right"
       ],
       [
         "Bottom Row",
-        "ANSI",
+        "Standard",
+        "Split Standard",
+        "Arrows",
+        "Split Arrows",
         "Tsangan",
-        "HHKB",
         "WKL",
-        "Arrow Keys",
-        "Japanese",
-        "Split Spacebar",
-        "Split Spacebar Arrow Keys"
+        "HHKB",
+        "Tsangan Arrows",
+        "LWKL Standard",
+        "LWKL Arrows",
+        "Minila"
       ]
     ],
     "keymap": [
@@ -66,7 +73,7 @@
         },
         "0,14\n\n\n0,0",
         {
-          "x": 0.75,
+          "x": 0.5,
           "c": "#cccccc"
         },
         "0,13\n\n\n0,1",
@@ -101,7 +108,7 @@
         },
         "1,13\n\n\n1,0",
         {
-          "x": 1.5,
+          "x": 1.25,
           "c": "#777777",
           "w": 1.25,
           "h": 2,
@@ -117,6 +124,9 @@
           "w": 1.75
         },
         "2,0",
+        {
+          "c": "#cccccc"
+        },
         "2,1",
         "2,2",
         "2,3",
@@ -134,7 +144,7 @@
         },
         "2,13\n\n\n1,0",
         {
-          "x": 0.5,
+          "x": 0.25,
           "c": "#cccccc"
         },
         "2,12\n\n\n1,1"
@@ -178,7 +188,7 @@
         },
         "4,2\n\n\n3,0",
         {
-          "c": "#777777",
+          "c": "#cccccc",
           "w": 6.25
         },
         "4,7\n\n\n3,0",
@@ -243,28 +253,22 @@
         "3,8\n\n\n2,2",
         "3,9\n\n\n2,2",
         "3,10\n\n\n2,2",
-        {
-          "w": 1.75
-        },
         "3,11\n\n\n2,2",
-        {
-          "c": "#777777"
-        },
         "3,13\n\n\n2,2",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.75
         },
         "3,14\n\n\n2,2"
       ],
       [
         {
-          "w": 1.25
+          "w": 2.25
         },
         "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",
@@ -274,12 +278,19 @@
         "3,8\n\n\n2,3",
         "3,9\n\n\n2,3",
         "3,10\n\n\n2,3",
-        "3,11\n\n\n2,3",
         {
           "c": "#aaaaaa",
-          "w": 2.75
+          "w": 1.75
+        },
+        "3,11\n\n\n2,3",
+        {
+          "c": "#777777"
+        },
+        "3,13\n\n\n2,3",
+        {
+          "c": "#aaaaaa"
         },
-        "3,13\n\n\n2,3"
+        "3,14\n\n\n2,3"
       ],
       [
         {
@@ -302,10 +313,9 @@
         "3,11\n\n\n2,4",
         {
           "c": "#aaaaaa",
-          "w": 1.75
+          "w": 2.75
         },
-        "3,13\n\n\n2,4",
-        "3,14\n\n\n2,4"
+        "3,13\n\n\n2,4"
       ],
       [
         {
@@ -325,27 +335,23 @@
         "3,8\n\n\n2,5",
         "3,9\n\n\n2,5",
         "3,10\n\n\n2,5",
-        {
-          "w": 1.75
-        },
         "3,11\n\n\n2,5",
         {
-          "c": "#777777"
+          "c": "#aaaaaa",
+          "w": 1.75
         },
         "3,13\n\n\n2,5",
-        {
-          "c": "#aaaaaa"
-        },
         "3,14\n\n\n2,5"
       ],
       [
         {
-          "w": 2
+          "w": 1.25
         },
         "3,0\n\n\n2,6",
         {
           "c": "#cccccc"
         },
+        "3,1\n\n\n2,6",
         "3,2\n\n\n2,6",
         "3,3\n\n\n2,6",
         "3,4\n\n\n2,6",
@@ -356,20 +362,17 @@
         "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": "#777777"
-        },
         "3,13\n\n\n2,6",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.75
         },
         "3,14\n\n\n2,6"
       ],
       [
+        {
+          "w": 1.25
+        },
         "3,0\n\n\n2,7",
         {
           "c": "#cccccc"
@@ -384,11 +387,11 @@
         "3,8\n\n\n2,7",
         "3,9\n\n\n2,7",
         "3,10\n\n\n2,7",
-        "3,11\n\n\n2,7",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.75
         },
-        "3,12\n\n\n2,7",
+        "3,11\n\n\n2,7",
         {
           "c": "#777777"
         },
@@ -398,241 +401,428 @@
         },
         "3,14\n\n\n2,7"
       ],
+      [
+        {
+          "w": 2
+        },
+        "3,0\n\n\n2,8",
+        {
+          "c": "#cccccc"
+        },
+        "3,2\n\n\n2,8",
+        "3,3\n\n\n2,8",
+        "3,4\n\n\n2,8",
+        "3,5\n\n\n2,8",
+        "3,6\n\n\n2,8",
+        "3,7\n\n\n2,8",
+        "3,8\n\n\n2,8",
+        "3,9\n\n\n2,8",
+        "3,10\n\n\n2,8",
+        "3,11\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"
+      ],
+      [
+        {
+          "w": 2
+        },
+        "3,0\n\n\n2,9",
+        {
+          "c": "#cccccc"
+        },
+        "3,2\n\n\n2,9",
+        "3,3\n\n\n2,9",
+        "3,4\n\n\n2,9",
+        "3,5\n\n\n2,9",
+        "3,6\n\n\n2,9",
+        "3,7\n\n\n2,9",
+        "3,8\n\n\n2,9",
+        "3,9\n\n\n2,9",
+        "3,10\n\n\n2,9",
+        "3,11\n\n\n2,9",
+        "3,12\n\n\n2,9",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "3,14\n\n\n2,9"
+      ],
+      [
+        "3,0\n\n\n2,10",
+        {
+          "c": "#cccccc"
+        },
+        "3,1\n\n\n2,10",
+        "3,2\n\n\n2,10",
+        "3,3\n\n\n2,10",
+        "3,4\n\n\n2,10",
+        "3,5\n\n\n2,10",
+        "3,6\n\n\n2,10",
+        "3,7\n\n\n2,10",
+        "3,8\n\n\n2,10",
+        "3,9\n\n\n2,10",
+        "3,10\n\n\n2,10",
+        "3,11\n\n\n2,10",
+        {
+          "c": "#aaaaaa"
+        },
+        "3,12\n\n\n2,10",
+        {
+          "c": "#777777"
+        },
+        "3,13\n\n\n2,10",
+        {
+          "c": "#aaaaaa"
+        },
+        "3,14\n\n\n2,10"
+      ],
+      [
+        "3,0\n\n\n2,11",
+        {
+          "c": "#cccccc"
+        },
+        "3,1\n\n\n2,11",
+        "3,2\n\n\n2,11",
+        "3,3\n\n\n2,11",
+        "3,4\n\n\n2,11",
+        "3,5\n\n\n2,11",
+        "3,6\n\n\n2,11",
+        "3,7\n\n\n2,11",
+        "3,8\n\n\n2,11",
+        "3,9\n\n\n2,11",
+        "3,10\n\n\n2,11",
+        "3,11\n\n\n2,11",
+        "3,12\n\n\n2,11",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "3,14\n\n\n2,11"
+      ],
       [
         {
           "y": 0.25,
-          "w": 1.5
+          "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,2\n\n\n3,1",
         {
-          "c": "#777777",
-          "w": 7
+          "c": "#cccccc",
+          "w": 2.25
+        },
+        "4,3\n\n\n3,1",
+        {
+          "w": 1.25
         },
         "4,7\n\n\n3,1",
+        {
+          "w": 2.75
+        },
+        "4,8\n\n\n3,1",
         {
           "c": "#aaaaaa",
-          "w": 1.5
+          "w": 1.25
+        },
+        "4,9\n\n\n3,1",
+        {
+          "w": 1.25
         },
         "4,10\n\n\n3,1",
+        {
+          "w": 1.25
+        },
         "4,12\n\n\n3,1",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,13\n\n\n3,1"
       ],
       [
         {
-          "w": 1.5,
-          "d": true
+          "w": 1.25
+        },
+        "4,0\n\n\n3,2",
+        {
+          "w": 1.25
         },
-        "\n\n\n3,2",
         "4,1\n\n\n3,2",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,2\n\n\n3,2",
         {
-          "c": "#777777",
-          "w": 7
+          "c": "#cccccc",
+          "w": 6.25
         },
         "4,7\n\n\n3,2",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "c": "#aaaaaa"
         },
+        "4,9\n\n\n3,2",
         "4,10\n\n\n3,2",
-        "4,12\n\n\n3,2",
         {
-          "w": 1.5,
-          "d": true
+          "c": "#777777"
         },
-        "\n\n\n3,2"
+        "4,11\n\n\n3,2",
+        "4,12\n\n\n3,2",
+        "4,13\n\n\n3,2"
       ],
       [
         {
-          "w": 1.5
+          "c": "#aaaaaa",
+          "w": 1.25
         },
         "4,0\n\n\n3,3",
         {
-          "d": true
+          "w": 1.25
         },
-        "\n\n\n3,3",
+        "4,1\n\n\n3,3",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,2\n\n\n3,3",
         {
-          "c": "#777777",
-          "w": 7
+          "c": "#cccccc",
+          "w": 2.25
+        },
+        "4,3\n\n\n3,3",
+        {
+          "w": 1.25
         },
         "4,7\n\n\n3,3",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "w": 2.75
         },
-        "4,10\n\n\n3,3",
+        "4,8\n\n\n3,3",
         {
-          "d": true
+          "c": "#aaaaaa"
         },
-        "\n\n\n3,3",
+        "4,9\n\n\n3,3",
+        "4,10\n\n\n3,3",
         {
-          "w": 1.5
+          "c": "#777777"
         },
+        "4,11\n\n\n3,3",
+        "4,12\n\n\n3,3",
         "4,13\n\n\n3,3"
       ],
       [
         {
-          "w": 1.25
+          "c": "#aaaaaa",
+          "w": 1.5
         },
         "4,0\n\n\n3,4",
-        {
-          "w": 1.25
-        },
         "4,1\n\n\n3,4",
         {
-          "w": 1.25
+          "w": 1.5
         },
         "4,2\n\n\n3,4",
         {
-          "c": "#777777",
-          "w": 6.25
+          "c": "#cccccc",
+          "w": 7
         },
         "4,7\n\n\n3,4",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "4,9\n\n\n3,4",
         "4,10\n\n\n3,4",
+        "4,12\n\n\n3,4",
         {
-          "c": "#777777"
+          "w": 1.5
         },
-        "4,11\n\n\n3,4",
-        "4,12\n\n\n3,4",
         "4,13\n\n\n3,4"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 1.75
+          "w": 1.5
         },
         "4,0\n\n\n3,5",
         {
-          "w": 1.25
-        },
-        "4,1\n\n\n3,5",
-        {
-          "w": 1.25
+          "x": 1,
+          "w": 1.5
         },
         "4,2\n\n\n3,5",
         {
-          "w": 1.25
-        },
-        "4,3\n\n\n3,5",
-        {
-          "c": "#777777",
-          "w": 3
+          "c": "#cccccc",
+          "w": 7
         },
         "4,7\n\n\n3,5",
         {
           "c": "#aaaaaa",
-          "w": 1.25
+          "w": 1.5
         },
-        "4,8\n\n\n3,5",
+        "4,10\n\n\n3,5",
         {
-          "w": 1.25
+          "x": 1,
+          "w": 1.5
         },
-        "4,9\n\n\n3,5",
-        "4,10\n\n\n3,5",
-        "4,11\n\n\n3,5",
-        "4,12\n\n\n3,5",
         "4,13\n\n\n3,5"
       ],
       [
         {
-          "w": 1.25
-        },
-        "4,0\n\n\n3,6",
-        {
-          "w": 1.25
+          "w": 1.5,
+          "d": true
         },
+        "\n\n\n3,6",
         "4,1\n\n\n3,6",
         {
-          "w": 1.25
+          "w": 1.5
         },
         "4,2\n\n\n3,6",
         {
-          "c": "#777777",
-          "w": 2.25
+          "c": "#cccccc",
+          "w": 7
         },
-        "4,3\n\n\n3,6",
+        "4,7\n\n\n3,6",
         {
-          "w": 1.25
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "4,7\n\n\n3,6",
+        "4,10\n\n\n3,6",
+        "4,12\n\n\n3,6"
+      ],
+      [
         {
-          "w": 2.75
+          "w": 1.5
+        },
+        "4,0\n\n\n3,7",
+        "4,1\n\n\n3,7",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n3,7",
+        {
+          "c": "#cccccc",
+          "w": 7
         },
-        "4,8\n\n\n3,6",
+        "4,7\n\n\n3,7",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,10\n\n\n3,7",
+        {
+          "c": "#777777"
+        },
+        "4,11\n\n\n3,7",
+        "4,12\n\n\n3,7",
+        "4,13\n\n\n3,7"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,0\n\n\n3,8",
+        {
+          "w": 1.5
+        },
+        "4,1\n\n\n3,8",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,7\n\n\n3,8",
         {
           "c": "#aaaaaa",
           "w": 1.25
         },
-        "4,9\n\n\n3,6",
+        "4,9\n\n\n3,8",
         {
           "w": 1.25
         },
-        "4,10\n\n\n3,6",
+        "4,10\n\n\n3,8",
         {
           "w": 1.25
         },
-        "4,12\n\n\n3,6",
+        "4,12\n\n\n3,8",
         {
           "w": 1.25
         },
-        "4,13\n\n\n3,6"
+        "4,13\n\n\n3,8"
       ],
       [
         {
-          "w": 1.25
+          "w": 1.5
         },
-        "4,0\n\n\n3,7",
+        "4,0\n\n\n3,9",
         {
-          "w": 1.25
+          "w": 1.5
         },
-        "4,1\n\n\n3,7",
+        "4,1\n\n\n3,9",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,7\n\n\n3,9",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,9\n\n\n3,9",
+        "4,10\n\n\n3,9",
+        {
+          "c": "#777777"
+        },
+        "4,11\n\n\n3,9",
+        "4,12\n\n\n3,9",
+        "4,13\n\n\n3,9"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "4,0\n\n\n4,5",
         {
           "w": 1.25
         },
-        "4,2\n\n\n3,7",
+        "4,1\n\n\n3,10",
         {
-          "c": "#777777",
-          "w": 2.25
+          "w": 1.25
         },
-        "4,3\n\n\n3,7",
+        "4,2\n\n\n3,10",
         {
           "w": 1.25
         },
-        "4,7\n\n\n3,7",
+        "4,3\n\n\n3,10",
         {
-          "w": 2.75
+          "c": "#cccccc",
+          "w": 3
         },
-        "4,8\n\n\n3,7",
+        "4,7\n\n\n3,10",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.25
         },
-        "4,9\n\n\n3,7",
-        "4,10\n\n\n3,7",
+        "4,8\n\n\n3,10",
+        {
+          "w": 1.25
+        },
+        "4,9\n\n\n3,10",
+        "4,10\n\n\n3,10",
         {
           "c": "#777777"
         },
-        "4,11\n\n\n3,7",
-        "4,12\n\n\n3,7",
-        "4,13\n\n\n3,7"
+        "4,11\n\n\n3,10",
+        "4,12\n\n\n3,10",
+        "4,13\n\n\n3,10"
       ]
     ]
   }