diff --git a/package.json b/package.json
index c2befcc..180e54c 100644
--- a/package.json
+++ b/package.json
@@ -594,24 +594,24 @@
             ],
             "explorer/context": [
                 {
-                    "command": "gitlens.showQuickFileHistory",
-                    "when": "gitlens:enabled",
-                    "group": "gitlens@1"
-                },
-                {
-                    "command": "gitlens.openFileInRemote",
-                    "when": "gitlens:enabled && gitlens:hasRemotes",
-                    "group": "gitlens@2"
-                },
-                {
                     "command": "gitlens.diffWithPrevious",
                     "when": "gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "gitlens_diff"
+                    "group": "1_gitlens@1"
                 },
                 {
                     "command": "gitlens.diffWithWorking",
                     "when": "gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "gitlens_diff"
+                    "group": "1_gitlens@2"
+                },
+                {
+                    "command": "gitlens.showQuickFileHistory",
+                    "when": "gitlens:enabled",
+                    "group": "1_gitlens_1@1"
+                },
+                {
+                    "command": "gitlens.openFileInRemote",
+                    "when": "gitlens:enabled && gitlens:hasRemotes",
+                    "group": "1_gitlens_1@2"
                 }
             ],
             "editor/title": [
@@ -621,41 +621,56 @@
                     "group": "navigation@100"
                 },
                 {
+                    "command": "gitlens.diffWithPrevious",
+                    "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
+                    "group": "2_gitlens"
+                },
+                {
+                    "command": "gitlens.diffWithWorking",
+                    "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
+                    "group": "2_gitlens"
+                },
+                {
                     "command": "gitlens.showQuickFileHistory",
                     "when": "editorFocus && gitlens:enabled",
-                    "group": "gitlens"
+                    "group": "2_gitlens_1"
                 },
                 {
                     "command": "gitlens.showQuickRepoHistory",
                     "when": "!editorFocus && gitlens:enabled",
-                    "group": "gitlens"
+                    "group": "2_gitlens_1"
                 },
                 {
                     "command": "gitlens.showQuickRepoStatus",
                     "when": "gitlens:enabled",
-                    "group": "gitlens"
-                },
+                    "group": "2_gitlens_1"
+                }
+            ],
+            "editor/title/context": [
                 {
                     "command": "gitlens.diffWithPrevious",
-                    "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "gitlens_diff"
+                    "when": "gitlens:enabled && config.gitlens.menus.diff.enabled",
+                    "group": "1_gitlens@1"
                 },
                 {
                     "command": "gitlens.diffWithWorking",
-                    "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "gitlens_diff"
-                }
-            ],
-            "editor/title/context": [
+                    "when": "gitlens:enabled && config.gitlens.menus.diff.enabled",
+                    "group": "1_gitlens@2"
+                },
+                {
+                    "command": "gitlens.showQuickFileHistory",
+                    "when": "gitlens:enabled",
+                    "group": "1_gitlens_1@1"
+                },
                 {
                     "command": "gitlens.toggleBlame",
                     "when": "gitlens:enabled && gitlens:isBlameable",
-                    "group": "gitlens@1"
+                    "group": "1_gitlens_1@2"
                 },
                 {
-                    "command": "gitlens.showQuickFileHistory",
-                    "when": "gitlens:enabled",
-                    "group": "gitlens@2"
+                    "command": "gitlens.openFileInRemote",
+                    "when": "gitlens:enabled && gitlens:hasRemotes",
+                    "group": "1_gitlens_1@3"
                 }
             ],
             "editor/context": [
@@ -677,24 +692,29 @@
                 {
                     "command": "gitlens.diffWithPrevious",
                     "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "1_gitlens-file@1"
+                    "group": "1_gitlens_1@1"
                 },
                 {
                     "command": "gitlens.diffWithWorking",
                     "when": "editorTextFocus && gitlens:enabled && config.gitlens.menus.diff.enabled",
-                    "group": "1_gitlens-file@2"
+                    "group": "1_gitlens_1@2"
                 },
                 {
-                    "command": "gitlens.toggleBlame",
-                    "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable",
+                    "command": "gitlens.showQuickFileHistory",
+                    "when": "gitlens:enabled",
                     "group": "2_gitlens@1"
                 },
                 {
-                    "command": "gitlens.showQuickFileHistory",
-                    "when": "gitlens:enabled",
+                    "command": "gitlens.toggleBlame",
+                    "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable",
                     "group": "2_gitlens@2"
                 },
                 {
+                    "command": "gitlens.openFileInRemote",
+                    "when": "editorTextFocus && gitlens:enabled && gitlens:hasRemotes",
+                    "group": "2_gitlens@3"
+                },
+                {
                     "command": "gitlens.copyShaToClipboard",
                     "when": "editorTextFocus && gitlens:enabled && gitlens:isBlameable",
                     "group": "9_gitlens@1"