diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..013007b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "dotnet.preferCSharpExtension": true
+}
\ No newline at end of file
diff --git a/lss-time-savers.sln b/lss-time-savers.sln
index 7fa5f46..709dadd 100644
--- a/lss-time-savers.sln
+++ b/lss-time-savers.sln
@@ -1,7 +1,6 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28714.193
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36408.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "~Solution Items", "~Solution Items", "{08B276AF-9E6A-4DD9-994F-964CFD71AC29}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/package.json b/package.json
index d0678e8..5038762 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "time-savers",
-  "version": "2.5.0",
-  "repository": "github.com/luminous-software/time-savers",
-  "license": "MIT",
-  "devDependencies": {
-    "gulp": "^4.0.0",
-    "gulp-all-tasks": "^1.1.4",
-    "gulp-util": "^3.0.8",
-    "opn": "^5.5.0"
-  },
-  "scripts": {
-    "serve": "mkdocs serve --dev-addr=127.0.0.1:8004"
-  }
-}
+    "name": "time-savers",
+    "version": "2.6.7",
+    "repository": "github.com/luminous-software/time-savers",
+    "license": "MIT",
+    "devDependencies": {
+        "gulp": "^4.0.0",
+        "gulp-all-tasks": "^1.1.4",
+        "gulp-util": "^3.0.8",
+        "opn": "^5.5.0"
+      },
+    "scripts": {
+        "serve": "mkdocs serve --dev-addr=127.0.0.1:8004"
+      }
+  }
\ No newline at end of file
diff --git a/src/core/Luminous.TimeSavers.Core.csproj b/src/core/Luminous.TimeSavers.Core.csproj
index 1fb1719..2d578e7 100644
--- a/src/core/Luminous.TimeSavers.Core.csproj
+++ b/src/core/Luminous.TimeSavers.Core.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Luminous.TimeSavers.Core</RootNamespace>
     <AssemblyName>Luminous.TimeSavers.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,4 +42,4 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/options/Luminous.TimeSavers.Options.csproj b/src/options/Luminous.TimeSavers.Options.csproj
index 028cf08..87b5cb3 100644
--- a/src/options/Luminous.TimeSavers.Options.csproj
+++ b/src/options/Luminous.TimeSavers.Options.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Luminous.TimeSavers.Options</RootNamespace>
     <AssemblyName>Luminous.TimeSavers.Options</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,9 +34,11 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <PackageReference Include="Luminous.Code.VisualStudio">
-      <Version>1.4.0</Version>
+      <Version>1.4.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\pkg\source.extension.cs">
diff --git a/src/pkg/Luminous.TimeSavers.csproj b/src/pkg/Luminous.TimeSavers.csproj
index ccfd473..a2cdf46 100644
--- a/src/pkg/Luminous.TimeSavers.csproj
+++ b/src/pkg/Luminous.TimeSavers.csproj
@@ -17,7 +17,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Luminous.TimeSavers</RootNamespace>
     <AssemblyName>Luminous.TimeSavers</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
@@ -119,14 +119,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Luminous.Code.Core">
-      <Version>1.4.0</Version>
+      <Version>1.4.2</Version>
     </PackageReference>
     <PackageReference Include="Luminous.Code.VisualStudio">
-      <Version>1.4.0</Version>
+      <Version>1.4.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>15.9.3039</Version>
+      <Version>17.14.2101</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/src/pkg/source.extension.cs b/src/pkg/source.extension.cs
index 803498e..1d9efee 100644
--- a/src/pkg/source.extension.cs
+++ b/src/pkg/source.extension.cs
@@ -11,7 +11,7 @@ internal sealed partial class Vsix
         public const string Name = "Time Savers";
         public const string Description = @"TimeSavers =>  developerProductivity++; ";
         public const string Language = "en-US";
-        public const string Version = "2.5.0";
+        public const string Version = "2.6.7";
         public const string Author = "Luminous Software Solutions";
         public const string Tags = "luminous,time savers,time-savers,timesavers,visual studio,productivity,yannduran,yd";
     }
diff --git a/src/pkg/source.extension.vsixmanifest b/src/pkg/source.extension.vsixmanifest
index ac5b38d..c7641dd 100644
--- a/src/pkg/source.extension.vsixmanifest
+++ b/src/pkg/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="049c7ac5-ba44-4a72-b4ee-7be7fb1b0edd" Version="2.5.0" Language="en-US" Publisher="Luminous Software Solutions" />
+        <Identity Id="049c7ac5-ba44-4a72-b4ee-7be7fb1b0edd" Version="2.6.7" Language="en-US" Publisher="Luminous Software Solutions" />
         <DisplayName>Time Savers</DisplayName>
         <Description xml:space="preserve">TimeSavers =&gt;  developerProductivity++; </Description>
         <MoreInfo>https://luminous-software.solutions/time-savers</MoreInfo>
@@ -13,10 +13,18 @@
         <Tags>luminous,time savers,time-savers,timesavers,visual studio,productivity,yannduran,yd</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0,17.0)">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[17.0,18.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>arm64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Dependencies>
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
     </Dependencies>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
diff --git a/src/ui/Luminous.TimeSavers.UI.csproj b/src/ui/Luminous.TimeSavers.UI.csproj
index 5950239..36d7184 100644
--- a/src/ui/Luminous.TimeSavers.UI.csproj
+++ b/src/ui/Luminous.TimeSavers.UI.csproj
@@ -8,7 +8,7 @@
     <OutputType>library</OutputType>
     <RootNamespace>Luminous.TimeSavers.UI</RootNamespace>
     <AssemblyName>Luminous.TimeSavers.UI</AssemblyName>
-    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -40,9 +40,11 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <PackageReference Include="Luminous.Code.VisualStudio">
-      <Version>1.4.0</Version>
+      <Version>1.4.2</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="15.9.3" ExcludeAssets="runtime" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\pkg\source.extension.cs">