Refactorings

src/Commands/GetMoreThemesCommand.cs

@@ -1,14 +1,26 @@
-using System;
+using System.Diagnostics;
 using Community.VisualStudio.Toolkit;
+using Microsoft.VisualStudio.Shell;
 
 namespace ThemeSwitcher
 {
     [Command(PackageIds.GetMoreThemes)]
     internal sealed class GetMoreThemesCommand : BaseCommand<GetMoreThemesCommand>
     {
-        protected override void Execute(object sender, EventArgs e)
+        private const string _url = "https://marketplace.visualstudio.com/search?term=theme&target=VS&vsVersion=";
+
+        protected override async System.Threading.Tasks.Task ExecuteAsync(OleMenuCmdEventArgs e)
         {
-            System.Diagnostics.Process.Start("https://marketplace.visualstudio.com/search?target=VS&category=Tools&vsVersion=&subCategory=Themes&sortBy=Installs");
+            EnvDTE80.DTE2 dte = await VS.GetServiceAsync<EnvDTE.DTE, EnvDTE80.DTE2>();
+
+            var vs = dte.Version switch
+            {
+                "16.0" => "vs2019",
+                "17.0" => "vs2022",
+                _ => ""
+            };
+
+            Process.Start(_url + vs);
         }
     }
 }

src/Commands/SelectThemeCommand.cs

@@ -15,34 +15,33 @@ protected override void BeforeQueryStatus(EventArgs e)
         {
             if (_commands.Any())
             {
-                return;
+                return; // The commands were already set up
             }
 
             IEnumerable<Theme> themes = ThemeStore.Themes.Value;
             OleMenuCommandService mcs = Package.GetService<IMenuCommandService, OleMenuCommandService>();
             var i = 1;
 
-            Theme firstTheme = themes.First();
-            Command.Enabled = Command.Visible = true;
-            Command.Text = firstTheme.Name;
-            Command.Checked = firstTheme.IsActive;
-            Command.Properties["guid"] = firstTheme.Guid;
-            _commands.Add(Command);
+            SetupCommand(Command, themes.First());
 
             foreach (Theme theme in themes.Skip(1))
             {
                 CommandID cmdId = new(PackageGuids.ThemeSwitcher, PackageIds.FirstTheme + i++);
-
                 OleMenuCommand command = new(Execute, cmdId);
-                command.Properties["guid"] = theme.Guid;
-                command.Text = theme.Name;
-                command.Checked = theme.IsActive;
+                SetupCommand(command, theme);
                 mcs.AddCommand(command);
-
-                _commands.Add(command);
             }
         }
 
+        private void SetupCommand(OleMenuCommand command, Theme theme)
+        {
+            command.Enabled = command.Visible = true;
+            command.Text = theme.Name;
+            command.Checked = theme.IsActive;
+            command.Properties["guid"] = theme.Guid;
+            _commands.Add(command);
+        }
+
         protected override void Execute(object sender, EventArgs e)
         {
             var command = (OleMenuCommand)sender;

src/ThemeSwitcher.csproj

@@ -86,6 +86,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Design" />
+    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Community.VisualStudio.VSCT" Version="16.0.29.6" PrivateAssets="all" />