diff --git a/v3/yandrstudio/yr6095/yr6095v1.json b/v3/yandrstudio/yr6095/yr6095v1.json
index 13d8d32ad7..629667c34d 100644
--- a/v3/yandrstudio/yr6095/yr6095v1.json
+++ b/v3/yandrstudio/yr6095/yr6095v1.json
@@ -38,22 +38,29 @@
     "labels": [
       "Split Backspace",
       "ISO Enter",
-      "No-left Shift",
+      "Tsangan Shift Row",
       [
-        "Space",
-        "6.25U Left Shift",
-        "7U WKL",
-        "Split Space Left Shift"
+        "Left Modifiers",
+        "3x1.25u",
+        "Tsangan",
+        "WKL",
+        "HHKB"
+      ],
+      [
+        "Spacebar",
+        "6.25u",
+        "Split 6.25u",
+        "Tsangan"
+      ],
+      [
+        "Right Modifiers",
+        "5x1u",
+        "Tsangan",
+        "WKL",
+        "HHKB",
+        "4x1u"
       ]
     ],
-    "presets": {
-      "default": [
-        0,
-        0,
-        0,
-        0
-      ]
-    },
     "keymap": [
       [
         {
@@ -81,13 +88,15 @@
         },
         "4,7\n\n\n0,0",
         {
-          "x": 0.5
+          "x": 0.5,
+          "c": "#cccccc"
         },
         "0,13\n\n\n0,1",
         "4,7\n\n\n0,1"
       ],
       [
         {
+          "c": "#aaaaaa",
           "w": 1.5
         },
         "1,0",
@@ -149,12 +158,13 @@
         "2,13\n\n\n1,0",
         {
           "x": 0.25,
-          "c": "#aaaaaa"
+          "c": "#cccccc"
         },
         "2,12\n\n\n1,1"
       ],
       [
         {
+          "c": "#aaaaaa",
           "w": 2
         },
         "3,0\n\n\n2,0",
@@ -176,18 +186,22 @@
         },
         "3,11\n\n\n2,0",
         {
-          "c": "#777777",
-          "f": 1
+          "c": "#777777"
         },
         "3,12\n\n\n2,0",
         {
-          "c": "#aaaaaa",
-          "f": 3
+          "c": "#aaaaaa"
         },
         "3,13\n\n\n2,0"
       ],
       [
         {
+          "w": 3.75,
+          "d": true
+        },
+        "\n\n\n4,0",
+        {
+          "x": -3.75,
           "w": 1.25
         },
         "4,0\n\n\n3,0",
@@ -203,22 +217,21 @@
           "c": "#cccccc",
           "w": 6.25
         },
-        "4,4\n\n\n3,0",
+        "4,4\n\n\n4,0",
         {
           "c": "#aaaaaa"
         },
-        "4,9\n\n\n3,0",
-        "4,10\n\n\n3,0",
+        "4,9\n\n\n5,0",
+        "4,10\n\n\n5,0",
         {
           "c": "#777777"
         },
-        "4,11\n\n\n3,0",
-        "4,12\n\n\n3,0",
-        "4,13\n\n\n3,0"
+        "4,11\n\n\n5,0",
+        "4,12\n\n\n5,0",
+        "4,13\n\n\n5,0"
       ],
       [
         {
-          "y": 0.25,
           "c": "#aaaaaa",
           "w": 2.25
         },
@@ -254,58 +267,111 @@
         },
         "4,2\n\n\n3,1",
         {
-          "c": "#cccccc",
-          "w": 7
+          "x": 6,
+          "d": true
         },
-        "4,5\n\n\n3,1",
+        "\n\n\n5,1",
         {
-          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,10\n\n\n3,1",
-        "4,12\n\n\n3,1",
+        "4,10\n\n\n5,1",
+        "4,12\n\n\n5,1",
         {
           "w": 1.5
         },
-        "4,13\n\n\n3,1"
+        "4,13\n\n\n5,1"
       ],
       [
         {
-          "w": 1.25
+          "w": 1.5
         },
         "4,0\n\n\n3,2",
         {
-          "w": 1.25
+          "x": 1,
+          "w": 1.5
         },
-        "4,1\n\n\n3,2",
+        "4,2\n\n\n3,2",
         {
-          "w": 1.25
+          "x": 6,
+          "d": true
         },
-        "4,2\n\n\n3,2",
+        "\n\n\n5,2",
+        {
+          "w": 1.5
+        },
+        "4,10\n\n\n5,2",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "4,13\n\n\n5,2"
+      ],
+      [
+        {
+          "w": 1.5,
+          "d": true
+        },
+        "\n\n\n3,3",
+        "4,1\n\n\n3,3",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n3,3",
+        {
+          "x": 6,
+          "d": true
+        },
+        "\n\n\n5,3",
+        {
+          "w": 1.5
+        },
+        "4,10\n\n\n5,3",
+        "4,12\n\n\n5,3"
+      ],
+      [
+        {
+          "w": 3.75,
+          "d": true
+        },
+        "\n\n\n4,1",
         {
           "c": "#cccccc",
           "w": 2.25
         },
-        "4,3\n\n\n3,2",
+        "4,3\n\n\n4,1",
         {
           "w": 1.25
         },
-        "4,4\n\n\n3,2",
+        "4,4\n\n\n4,1",
         {
           "w": 2.75
         },
-        "4,8\n\n\n3,2",
+        "4,8\n\n\n4,1",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "d": true
         },
-        "4,9\n\n\n3,2",
-        "4,10\n\n\n3,2",
+        "\n\n\n5,4",
+        "4,10\n\n\n5,4",
         {
           "c": "#777777"
         },
-        "4,11\n\n\n3,2",
-        "4,12\n\n\n3,2",
-        "4,13\n\n\n3,2"
+        "4,11\n\n\n5,4",
+        "4,12\n\n\n5,4",
+        "4,13\n\n\n5,4"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 4,
+          "d": true
+        },
+        "\n\n\n4,2",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,5\n\n\n4,2"
       ]
     ]
   }