diff --git a/GodotAddinVS/GodotAddinVS.csproj b/GodotAddinVS/GodotAddinVS.csproj
index 565b57f..6ccce17 100644
--- a/GodotAddinVS/GodotAddinVS.csproj
+++ b/GodotAddinVS/GodotAddinVS.csproj
@@ -75,7 +75,8 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Clide" Version="3.2.68" />
+    <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">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -84,7 +85,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Mono.Debugging.VisualStudio" Version="16.1.3-pre" />
+    <PackageReference Include="Mono.Debugging.VisualStudio" Version="16.1.3-pre" ExcludeAssets="runtime" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="icon.png">
@@ -99,9 +100,6 @@
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>
   </ItemGroup>
-  <ItemGroup>
-    <VSIXSourceItem Include="@(MonoDebuggingVsix)" />
-  </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
@@ -121,4 +119,4 @@
   </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/GodotAddinVS/source.extension.vsixmanifest b/GodotAddinVS/source.extension.vsixmanifest
index 84da09d..df91b46 100644
--- a/GodotAddinVS/source.extension.vsixmanifest
+++ b/GodotAddinVS/source.extension.vsixmanifest
@@ -1,8 +1,8 @@
 <?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="Godot.Addin" Version="1.0" Language="en-US" Publisher="Ignacio Roldán Etcheverry" />
-        <DisplayName>Godot Addin</DisplayName>
+        <Identity Id="GodotAddinVS" Version="1.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>
         <Icon>icon.png</Icon>
@@ -15,13 +15,22 @@
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="GodotCompletionProviders" Path="|GodotCompletionProviders|" />
     </Assets>
     <Dependencies>
-        <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,)" />
+        <Dependency d:Source="Installed" Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" Version="[16.0,)" />
+        <Dependency d:Source="Installed" Id="Mono.Debugging.VisualStudio" DisplayName="Mono Debugging for Visual Studio" Version="[16.0,17.0)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.MonoDebugger"
-                      Version="[4.6,)"
-                      DisplayName="Mono debugger" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.MonoDebugger" Version="[16.0,)" DisplayName="Mono debugger" />
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,)" DisplayName="Visual Studio core editor" />
         <Prerequisite Id="Microsoft.VisualStudio.Component.Roslyn.LanguageServices" Version="[16.0,)" DisplayName="Roslyn Language Services" />
+
+        <!--
+        Found no better way to make Visual Studio install Clide when installing this extension.
+        Adding Clide to Dependencies doesn't work. VisualStudio fails to resolve it during installation.
+        We can include 'Clide.Core.Windows.dll' as a Mef component in this extension, but that causes
+        issues if Xamarin is installed too (two 'Clide.Core.Windows.dll' so components are exported twice).
+        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" /-->
     </Prerequisites>
 </PackageManifest>
diff --git a/README.md b/README.md
index 57dcd87..c1e0bf3 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Visual Studio extension for the Godot game engine C# projects.
 
 ## Requirements
 
-**Godot 3.2.2** or greater. Older versions of Godot are not supported.
+- **Godot 3.2.2** or greater. Older versions of Godot are not supported.
 
 ## Features