From 5e5b191cc22952694d297f3ed89aa4c6d436046e Mon Sep 17 00:00:00 2001
From: Duncan Sutherland <dunk2k_2000@hotmail.com>
Date: Mon, 13 May 2024 11:52:12 +0100
Subject: [PATCH] simplify

---
 v3/yandrstudio/yr6095/yr6095v1.json | 165 +++++++++++++++-------------
 1 file changed, 86 insertions(+), 79 deletions(-)

diff --git a/v3/yandrstudio/yr6095/yr6095v1.json b/v3/yandrstudio/yr6095/yr6095v1.json
index 629667c34d..4293076130 100644
--- a/v3/yandrstudio/yr6095/yr6095v1.json
+++ b/v3/yandrstudio/yr6095/yr6095v1.json
@@ -40,25 +40,13 @@
       "ISO Enter",
       "Tsangan Shift Row",
       [
-        "Left Modifiers",
-        "3x1.25u",
+        "Bottom Row",
+        "64-key",
+        "Split 64-key",
+        "64-key Tsangan",
         "Tsangan",
         "WKL",
         "HHKB"
-      ],
-      [
-        "Spacebar",
-        "6.25u",
-        "Split 6.25u",
-        "Tsangan"
-      ],
-      [
-        "Right Modifiers",
-        "5x1u",
-        "Tsangan",
-        "WKL",
-        "HHKB",
-        "4x1u"
       ]
     ],
     "keymap": [
@@ -116,7 +104,6 @@
         "1,11",
         "1,12",
         {
-          "c": "#aaaaaa",
           "w": 1.5
         },
         "1,13\n\n\n1,0",
@@ -196,12 +183,6 @@
       ],
       [
         {
-          "w": 3.75,
-          "d": true
-        },
-        "\n\n\n4,0",
-        {
-          "x": -3.75,
           "w": 1.25
         },
         "4,0\n\n\n3,0",
@@ -217,21 +198,22 @@
           "c": "#cccccc",
           "w": 6.25
         },
-        "4,4\n\n\n4,0",
+        "4,4\n\n\n3,0",
         {
           "c": "#aaaaaa"
         },
-        "4,9\n\n\n5,0",
-        "4,10\n\n\n5,0",
+        "4,9\n\n\n3,0",
+        "4,10\n\n\n3,0",
         {
           "c": "#777777"
         },
-        "4,11\n\n\n5,0",
-        "4,12\n\n\n5,0",
-        "4,13\n\n\n5,0"
+        "4,11\n\n\n3,0",
+        "4,12\n\n\n3,0",
+        "4,13\n\n\n3,0"
       ],
       [
         {
+          "y": 0.25,
           "c": "#aaaaaa",
           "w": 2.25
         },
@@ -258,120 +240,145 @@
       ],
       [
         {
-          "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,2\n\n\n3,1",
         {
-          "x": 6,
-          "d": true
+          "c": "#cccccc",
+          "w": 2.25
         },
-        "\n\n\n5,1",
+        "4,3\n\n\n3,1",
         {
-          "w": 1.5
+          "w": 1.25
         },
-        "4,10\n\n\n5,1",
-        "4,12\n\n\n5,1",
+        "4,4\n\n\n3,1",
         {
-          "w": 1.5
+          "w": 2.75
+        },
+        "4,8\n\n\n3,1",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,9\n\n\n3,1",
+        "4,10\n\n\n3,1",
+        {
+          "c": "#777777"
         },
-        "4,13\n\n\n5,1"
+        "4,11\n\n\n3,1",
+        "4,12\n\n\n3,1",
+        "4,13\n\n\n3,1"
       ],
       [
         {
+          "c": "#aaaaaa",
           "w": 1.5
         },
         "4,0\n\n\n3,2",
+        "4,1\n\n\n3,2",
         {
-          "x": 1,
           "w": 1.5
         },
         "4,2\n\n\n3,2",
         {
-          "x": 6,
-          "d": true
+          "c": "#cccccc",
+          "w": 7
         },
-        "\n\n\n5,2",
+        "4,5\n\n\n3,2",
         {
-          "w": 1.5
+          "c": "#aaaaaa"
         },
-        "4,10\n\n\n5,2",
+        "4,10\n\n\n3,2",
         {
-          "x": 1,
-          "w": 1.5
+          "c": "#777777"
         },
-        "4,13\n\n\n5,2"
+        "4,11\n\n\n3,2",
+        "4,12\n\n\n3,2",
+        "4,13\n\n\n3,2"
       ],
       [
         {
-          "w": 1.5,
-          "d": true
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "\n\n\n3,3",
+        "4,0\n\n\n3,3",
         "4,1\n\n\n3,3",
         {
           "w": 1.5
         },
         "4,2\n\n\n3,3",
         {
-          "x": 6,
-          "d": true
+          "c": "#cccccc",
+          "w": 7
         },
-        "\n\n\n5,3",
+        "4,5\n\n\n3,3",
         {
+          "c": "#aaaaaa",
           "w": 1.5
         },
-        "4,10\n\n\n5,3",
-        "4,12\n\n\n5,3"
-      ],
-      [
+        "4,10\n\n\n3,3",
+        "4,12\n\n\n3,3",
         {
-          "w": 3.75,
-          "d": true
+          "w": 1.5
         },
-        "\n\n\n4,1",
+        "4,13\n\n\n3,3"
+      ],
+      [
         {
-          "c": "#cccccc",
-          "w": 2.25
+          "w": 1.5
         },
-        "4,3\n\n\n4,1",
+        "4,0\n\n\n3,4",
         {
-          "w": 1.25
+          "x": 1,
+          "w": 1.5
         },
-        "4,4\n\n\n4,1",
+        "4,2\n\n\n3,4",
         {
-          "w": 2.75
+          "c": "#cccccc",
+          "w": 7
         },
-        "4,8\n\n\n4,1",
+        "4,5\n\n\n3,4",
         {
           "c": "#aaaaaa",
-          "d": true
+          "w": 1.5
         },
-        "\n\n\n5,4",
-        "4,10\n\n\n5,4",
+        "4,10\n\n\n3,4",
         {
-          "c": "#777777"
+          "x": 1,
+          "w": 1.5
         },
-        "4,11\n\n\n5,4",
-        "4,12\n\n\n5,4",
-        "4,13\n\n\n5,4"
+        "4,13\n\n\n3,4"
       ],
       [
         {
-          "c": "#aaaaaa",
-          "w": 4,
+          "w": 1.5,
           "d": true
         },
-        "\n\n\n4,2",
+        "\n\n\n3,5",
+        "4,1\n\n\n3,5",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n3,5",
         {
           "c": "#cccccc",
           "w": 7
         },
-        "4,5\n\n\n4,2"
+        "4,5\n\n\n3,5",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n3,5",
+        "4,12\n\n\n3,5"
       ]
     ]
   }