diff --git a/GodotAddinVS/GodotAddinVS.csproj b/GodotAddinVS/GodotAddinVS.csproj
index 6ccce17..cb3223c 100644
--- a/GodotAddinVS/GodotAddinVS.csproj
+++ b/GodotAddinVS/GodotAddinVS.csproj
@@ -78,10 +78,10 @@
     <PackageReference Include="Clide" Version="4.1.1" ExcludeAssets="runtime" />
     <PackageReference Include="Clide.Windows" Version="4.1.1" ExcludeAssets="runtime" />
     <PackageReference Include="GodotTools.IdeMessaging" Version="1.1.1" />
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.205" ExcludeAssets="runtime">
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.5.2044">
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5234">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -119,4 +119,4 @@
   </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/GodotAddinVS/GodotMessaging/MessageHandler.cs b/GodotAddinVS/GodotMessaging/MessageHandler.cs
index 5b7e117..535d1c4 100644
--- a/GodotAddinVS/GodotMessaging/MessageHandler.cs
+++ b/GodotAddinVS/GodotMessaging/MessageHandler.cs
@@ -44,7 +44,7 @@ protected override async Task<Response> HandleOpenFile(OpenFileRequest request)
 
             var mainWindow = dte.MainWindow;
             mainWindow.Activate();
-            SetForegroundWindow(new IntPtr(mainWindow.HWnd));
+            SetForegroundWindow(mainWindow.HWnd);
 
             return new OpenFileResponse {Status = MessageStatus.Ok};
         }
diff --git a/GodotAddinVS/GodotSolutionEventsListener.cs b/GodotAddinVS/GodotSolutionEventsListener.cs
index 28a1a8d..0d0be66 100644
--- a/GodotAddinVS/GodotSolutionEventsListener.cs
+++ b/GodotAddinVS/GodotSolutionEventsListener.cs
@@ -148,6 +148,7 @@ private void DebuggerEvents_OnEnterDesignMode(dbgEventReason reason)
 
         private void Close()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             if (GodotMessagingClient != null)
             {
                 ServiceContainer.RemoveService(typeof(Client));
diff --git a/GodotAddinVS/source.extension.vsixmanifest b/GodotAddinVS/source.extension.vsixmanifest
index fae292c..1474eac 100644
--- a/GodotAddinVS/source.extension.vsixmanifest
+++ b/GodotAddinVS/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="GodotAddinVS" Version="1.1.1" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
+        <Identity Id="GodotAddinVS" Version="2.0.0" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
         <DisplayName>Godot Support</DisplayName>
         <Description xml:space="preserve">Support for Godot Engine C# projects, including debugging and extended code completion.</Description>
         <License>LICENSE.txt</License>
@@ -9,7 +9,24 @@
         <Tags>Godot</Tags>
     </Metadata>
     <Installation>
-        <InstallationTarget Version="[16.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
+            <ProductArchitecture>x86</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Community">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Pro">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
+        <InstallationTarget Version="[16.0,18.0)" Id="Microsoft.VisualStudio.Enterprise">
+            <ProductArchitecture>amd64</ProductArchitecture>
+        </InstallationTarget>
     </Installation>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GodotCompletionProviders" Path="|GodotCompletionProviders|" />
@@ -30,6 +47,6 @@
         As such, this extension sadly requires Xamarin to be installed as well for now. It's a quite
         bulky dependency, so we should continue looking for possible alternatives to this.
         -->
-        <Prerequisite Id="Component.Xamarin" Version="[16.6.30013.169,17.0)" DisplayName="Xamarin" />
+        <Prerequisite Id="Component.Xamarin" Version="[16.0,)" DisplayName="Xamarin" />
     </Prerequisites>
 </PackageManifest>
diff --git a/README.md b/README.md
index 3497a3b..325bcd3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,8 @@ Visual Studio extension for the Godot game engine C# projects.
 ## Requirements
 
 - **Godot 3.2.3** or greater. Older versions of Godot are not supported and do not work.
-- **Visual Studio 2019**. VS 2017 or earlier are not supported.
+- **Visual Studio 2022**. VS 2019 or earlier are not supported.
+- **Visit 1.x** branch to get the **Visual Studio 2019** supported version.
 
 ## Features