diff --git a/Common/CollapseRegionCommon.projitems b/Common/CollapseRegionCommon.projitems
index c9c9d44..96652a8 100644
--- a/Common/CollapseRegionCommon.projitems
+++ b/Common/CollapseRegionCommon.projitems
@@ -12,9 +12,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)RegionCommands.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RegionCommandsPackage.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)RegionCommandsPackage.vsct" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)VSPackage.resx" />
   </ItemGroup>
diff --git a/Common/RegionCommandsPackage.vsct b/Common/RegionCommandsPackage.vsct
deleted file mode 100644
index 54cf87d..0000000
--- a/Common/RegionCommandsPackage.vsct
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <!--  This is the file that defines the actual layout and type of the commands.
-        It is divided in different sections (e.g. command definition, command
-        placement, ...), with each defining a specific set of properties.
-        See the comment before each section for more details about how to
-        use it. -->
-
-  <!--  The VSCT compiler (the tool that translates this file into the binary
-        format that VisualStudio will consume) has the ability to run a preprocessor
-        on the vsct file; this preprocessor is (usually) the C++ preprocessor, so
-        it is possible to define includes and macros with the same syntax used
-        in C++ files. Using this ability of the compiler here, we include some files
-        defining some of the constants that we will use inside the file. -->
-
-  <!--This is the file that defines the IDs for all the commands exposed by VisualStudio. -->
-  <Extern href="stdidcmd.h"/>
-
-  <!--This header contains the command ids for the menus provided by the shell. -->
-  <Extern href="vsshlids.h"/>
-
-  <!--The Commands section is where commands, menus, and menu groups are defined.
-      This section uses a Guid to identify the package that provides the command defined inside it. -->
-  <Commands package="guidRegionCommandsPackage">
-    <!-- Inside this section we have different sub-sections: one for the menus, another
-    for the menu groups, one for the buttons (the actual commands), one for the combos
-    and the last one for the bitmaps used. Each element is identified by a command id that
-    is a unique pair of guid and numeric identifier; the guid part of the identifier is usually
-    called "command set" and is used to group different command inside a logically related
-    group; your package should define its own command set in order to avoid collisions
-    with command ids defined by other packages. -->
-
-    <!-- In this section you can define new menu groups. A menu group is a container for
-         other menus or buttons (commands); from a visual point of view you can see the
-         group as the part of a menu contained between two lines. The parent of a group
-         must be a menu. -->
-    <Groups>
-      <Group guid="guidRegionCommandsPackageCmdSet" id="MyMenuGroup" priority="0x0600">
-      </Group>
-    </Groups>
-
-    <!--Buttons section. -->
-    <!--This section defines the elements the user can interact with, like a menu command or a button
-        or combo box in a toolbar. -->
-    <Buttons>
-      <!--To define a menu group you have to specify its ID, the parent menu and its display priority.
-          The command is visible and enabled by default. If you need to change the visibility, status, etc, you can use
-          the CommandFlag node.
-          You can add more than one CommandFlag node e.g.:
-              <CommandFlag>DefaultInvisible</CommandFlag>
-              <CommandFlag>DynamicVisibility</CommandFlag>
-          If you do not want an image next to your command, remove the Icon node /> -->
-      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId" priority="0x0100" type="Button">
-        <Strings>
-          <LocCanonicalName>RegionManagement.Expand</LocCanonicalName>
-          <ButtonText>Expand all regions</ButtonText>
-        </Strings>
-      </Button>
-      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId" priority="0x0100" type="Button">
-        <Strings>
-          <LocCanonicalName>RegionManagement.Collapse</LocCanonicalName>
-          <ButtonText>Collapse all regions</ButtonText>
-        </Strings>
-      </Button>
-    </Buttons>
-
-  </Commands>
-
-  <KeyBindings>
-    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId"
-      editor="guidVSStd97" key1="R" mod1="Control" key2="VK_ADD" mod2="Control"/>
-    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId"
-      editor="guidVSStd97" key1="R" mod1="Control" key2="VK_SUBTRACT" mod2="Control"/>
-  </KeyBindings>
-
-  <Symbols>
-    <!-- This is the package guid. -->
-    <GuidSymbol name="guidRegionCommandsPackage" value="{87e70c51-1e00-4e22-9099-85542c07fdd3}" />
-
-    <!-- This is the guid used to group the menu commands together -->
-    <GuidSymbol name="guidRegionCommandsPackageCmdSet" value="{155b6515-ed99-4e79-8950-2bdf525871db}">
-      <IDSymbol name="MyMenuGroup" value="0x0200" />
-      <IDSymbol name="RegionExpandId" value="0x0100" />
-      <IDSymbol name="RegionCollapseId" value="0x0101" />
-    </GuidSymbol>
-
-  </Symbols>
-</CommandTable>
diff --git a/Metadata/RegionCommandsPackage.vsct b/Metadata/RegionCommandsPackage.vsct
index 54cf87d..6489f01 100644
--- a/Metadata/RegionCommandsPackage.vsct
+++ b/Metadata/RegionCommandsPackage.vsct
@@ -35,10 +35,12 @@
          other menus or buttons (commands); from a visual point of view you can see the
          group as the part of a menu contained between two lines. The parent of a group
          must be a menu. -->
+    <!--
     <Groups>
-      <Group guid="guidRegionCommandsPackageCmdSet" id="MyMenuGroup" priority="0x0600">
+      <Group guid="guidRegionCommandsPackageCmdSet" id="RegionCommandsGroup" priority="0xFFFF">
       </Group>
     </Groups>
+    -->
 
     <!--Buttons section. -->
     <!--This section defines the elements the user can interact with, like a menu command or a button
@@ -51,27 +53,26 @@
               <CommandFlag>DefaultInvisible</CommandFlag>
               <CommandFlag>DynamicVisibility</CommandFlag>
           If you do not want an image next to your command, remove the Icon node /> -->
-      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId" priority="0x0100" type="Button">
+      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId" priority="0xFFFF" type="Button">
+        <Parent guid="guidStdEd" id="IDG_VS_EDITOR_OUTLINING_CMDS" />
         <Strings>
           <LocCanonicalName>RegionManagement.Expand</LocCanonicalName>
           <ButtonText>Expand all regions</ButtonText>
         </Strings>
       </Button>
-      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId" priority="0x0100" type="Button">
+      <Button guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId" priority="0xFFFF" type="Button">
+        <Parent guid="guidStdEd" id="IDG_VS_EDITOR_OUTLINING_CMDS" />
         <Strings>
           <LocCanonicalName>RegionManagement.Collapse</LocCanonicalName>
           <ButtonText>Collapse all regions</ButtonText>
         </Strings>
       </Button>
     </Buttons>
-
   </Commands>
 
   <KeyBindings>
-    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId"
-      editor="guidVSStd97" key1="R" mod1="Control" key2="VK_ADD" mod2="Control"/>
-    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId"
-      editor="guidVSStd97" key1="R" mod1="Control" key2="VK_SUBTRACT" mod2="Control"/>
+    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionExpandId" editor="guidVSStd97" key1="R" mod1="Control" key2="VK_ADD" mod2="Control" />
+    <KeyBinding guid="guidRegionCommandsPackageCmdSet" id="RegionCollapseId" editor="guidVSStd97" key1="R" mod1="Control" key2="VK_SUBTRACT" mod2="Control" />
   </KeyBindings>
 
   <Symbols>
@@ -80,7 +81,7 @@
 
     <!-- This is the guid used to group the menu commands together -->
     <GuidSymbol name="guidRegionCommandsPackageCmdSet" value="{155b6515-ed99-4e79-8950-2bdf525871db}">
-      <IDSymbol name="MyMenuGroup" value="0x0200" />
+      <!--<IDSymbol name="RegionCommandsGroup" value="0x0200" />-->
       <IDSymbol name="RegionExpandId" value="0x0100" />
       <IDSymbol name="RegionCollapseId" value="0x0101" />
     </GuidSymbol>
diff --git a/VS2017/source.extension.vsixmanifest b/VS2017/source.extension.vsixmanifest
index aa339ee..33da686 100644
--- a/VS2017/source.extension.vsixmanifest
+++ b/VS2017/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.4" Language="en-US" Publisher="Matt Mower" />
+        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.5" Language="en-US" Publisher="Matt Mower" />
         <DisplayName>Collapse Region</DisplayName>
         <Description xml:space="preserve">Collapse/Expand #regions in code editor tabs.</Description>
         <MoreInfo>https://github.com/mdmower/CollapseRegionExtension</MoreInfo>
diff --git a/VS2019/source.extension.vsixmanifest b/VS2019/source.extension.vsixmanifest
index 89d75ee..0790056 100644
--- a/VS2019/source.extension.vsixmanifest
+++ b/VS2019/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.4" Language="en-US" Publisher="Matt Mower" />
+        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.5" Language="en-US" Publisher="Matt Mower" />
         <DisplayName>Collapse Region</DisplayName>
         <Description xml:space="preserve">Collapse/Expand #regions in code editor tabs.</Description>
         <MoreInfo>https://github.com/mdmower/CollapseRegionExtension</MoreInfo>
diff --git a/VS2022/source.extension.vsixmanifest b/VS2022/source.extension.vsixmanifest
index a0e8752..3cd7419 100644
--- a/VS2022/source.extension.vsixmanifest
+++ b/VS2022/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.4" Language="en-US" Publisher="Matt Mower" />
+        <Identity Id="CollapseRegionExtension.0c27e759-a1dc-4e4b-9795-1aeb944b714f" Version="1.5" Language="en-US" Publisher="Matt Mower" />
         <DisplayName>Collapse Region</DisplayName>
         <Description xml:space="preserve">Collapse/Expand #regions in code editor tabs.</Description>
         <MoreInfo>https://github.com/mdmower/CollapseRegionExtension</MoreInfo>