diff --git a/v3/bioi/g60/g60.json b/v3/bioi/g60/g60.json
index af9eb3c02d..d8228c6ef6 100644
--- a/v3/bioi/g60/g60.json
+++ b/v3/bioi/g60/g60.json
@@ -1,5 +1,5 @@
 {
-  "name": "BIOI G60 BLE",
+  "name": "BIOI G60",
   "vendorId": "0x8101",
   "productId": "0x6080",
   "matrix": {
@@ -17,12 +17,20 @@
       "Split Backspace",
       "ISO Enter",
       "ISO Left Shift",
-      "Right Shift with Arrow Up",
+      [
+        "Right Shift",
+        "Standard",
+        "Tsangan",
+        "Arrows"
+      ],
       [
         "Bottom Row",
-        "ANSI",
-        "7u",
-        "Arrow Keys"
+        "Standard",
+        "Arrows",
+        "Tsangan",
+        "WKL",
+        "HHKB",
+        "Tsangan Arrows"
       ]
     ],
     "keymap": [
@@ -48,11 +56,13 @@
         "0,11",
         "0,12",
         {
+          "c": "#aaaaaa",
           "w": 2
         },
         "0,13\n\n\n0,0",
         {
-          "x": 0.25
+          "x": 0.25,
+          "c": "#cccccc"
         },
         "0,13\n\n\n0,1",
         "4,9\n\n\n0,1"
@@ -132,9 +142,13 @@
           "w": 1.25
         },
         "3,0\n\n\n2,1",
+        {
+          "c": "#cccccc"
+        },
         "3,1\n\n\n2,1",
         {
           "x": 0.25,
+          "c": "#aaaaaa",
           "w": 2.25
         },
         "3,0\n\n\n2,0",
@@ -153,22 +167,19 @@
         "3,11\n\n\n3,0",
         {
           "c": "#aaaaaa",
-          "w": 1.75
+          "w": 2.75
         },
         "3,13\n\n\n3,0",
-        "3,12\n\n\n3,0",
         {
           "x": 0.25,
-          "w": 1.75
-        },
-        "3,13\n\n\n3,1",
-        {
-          "c": "#777777"
+          "c": "#cccccc"
         },
-        "4,7\n\n\n3,1",
+        "3,11\n\n\n3,1",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.75
         },
+        "3,13\n\n\n3,1",
         "3,12\n\n\n3,1"
       ],
       [
@@ -206,66 +217,158 @@
         {
           "w": 1.25
         },
-        "4,13\n\n\n4,0"
+        "4,13\n\n\n4,0",
+        {
+          "x": 0.25,
+          "w": 1.75
+        },
+        "3,13\n\n\n3,2",
+        {
+          "c": "#777777"
+        },
+        "4,7\n\n\n3,2",
+        {
+          "c": "#aaaaaa"
+        },
+        "3,12\n\n\n3,2"
       ],
       [
         {
           "y": 0.25,
           "x": 2.5,
-          "w": 1.5
+          "w": 1.25
         },
         "4,0\n\n\n4,1",
+        {
+          "w": 1.25
+        },
         "4,1\n\n\n4,1",
         {
-          "w": 1.5
+          "w": 1.25
         },
         "4,2\n\n\n4,1",
         {
           "c": "#cccccc",
-          "w": 7
+          "w": 6.25
         },
         "4,5\n\n\n4,1",
         {
-          "c": "#aaaaaa",
-          "w": 1.5
+          "c": "#aaaaaa"
         },
+        "4,10\n\n\n4,1",
         "4,11\n\n\n4,1",
-        "4,12\n\n\n4,1",
         {
-          "w": 1.5
+          "c": "#777777"
         },
+        "4,8\n\n\n4,1",
+        "4,12\n\n\n4,1",
         "4,13\n\n\n4,1"
       ],
       [
         {
           "x": 2.5,
-          "w": 1.25
+          "c": "#aaaaaa",
+          "w": 1.5
         },
         "4,0\n\n\n4,2",
-        {
-          "w": 1.25
-        },
         "4,1\n\n\n4,2",
         {
-          "w": 1.25
+          "w": 1.5
         },
         "4,2\n\n\n4,2",
         {
           "c": "#cccccc",
-          "w": 6.25
+          "w": 7
         },
         "4,5\n\n\n4,2",
         {
-          "c": "#aaaaaa"
+          "c": "#aaaaaa",
+          "w": 1.5
         },
-        "4,10\n\n\n4,2",
         "4,11\n\n\n4,2",
+        "4,12\n\n\n4,2",
         {
-          "c": "#777777"
+          "w": 1.5
         },
-        "4,8\n\n\n4,2",
-        "4,12\n\n\n4,2",
         "4,13\n\n\n4,2"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "4,0\n\n\n4,3",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "4,2\n\n\n4,3",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,5\n\n\n4,3",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n4,3",
+        {
+          "x": 1,
+          "w": 1.5
+        },
+        "4,13\n\n\n4,3"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5,
+          "d": true
+        },
+        "\n\n\n4,4",
+        "4,1\n\n\n4,4",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n4,4",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,5\n\n\n4,4",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,11\n\n\n4,4",
+        "4,12\n\n\n4,4"
+      ],
+      [
+        {
+          "x": 2.5,
+          "w": 1.5
+        },
+        "4,0\n\n\n4,5",
+        "4,1\n\n\n4,5",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n4,5",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,5\n\n\n4,5",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,11\n\n\n4,5",
+        {
+          "c": "#777777"
+        },
+        "4,8\n\n\n4,5",
+        "4,12\n\n\n4,5",
+        "4,13\n\n\n4,5"
       ]
     ]
   }