diff --git a/ide_plugins/vs/coati_plugin_vs_2012.vsix b/ide_plugins/vs/coati_plugin_vs_2012.vsix
deleted file mode 100644
index dbef1e58..00000000
Binary files a/ide_plugins/vs/coati_plugin_vs_2012.vsix and /dev/null differ
diff --git a/ide_plugins/vs/coati_plugin_vs_2015.vsix b/ide_plugins/vs/coati_plugin_vs_2015.vsix
deleted file mode 100644
index dbef1e58..00000000
Binary files a/ide_plugins/vs/coati_plugin_vs_2015.vsix and /dev/null differ
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.sln b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.sln
similarity index 90%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.sln
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.sln
index d49e21df..7cc3560d 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.sln
+++ b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoatiPlugin", "CoatiPlugin\CoatiPlugin.csproj", "{A585A530-E120-4C74-934E-D57ED12A7DA9}"
 EndProject
 Global
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.v11.suo
similarity index 77%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.v11.suo
index dcaedb35..2e144d3b 100644
Binary files a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo and b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin.v11.suo differ
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
similarity index 97%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
index 0c0df1c6..ff90f43a 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
+++ b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>4.0</OldToolsVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj.user b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj.user
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj.user
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.csproj.user
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPlugin.vsct
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/FileUtility.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/FileUtility.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/FileUtility.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/FileUtility.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/GlobalSuppressions.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/GlobalSuppressions.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/GlobalSuppressions.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/GlobalSuppressions.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Guids.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Guids.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Guids.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Guids.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Key.snk b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Key.snk
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Key.snk
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Key.snk
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkProtocolUtility.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/NetworkProtocolUtility.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkProtocolUtility.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/NetworkProtocolUtility.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/NetworkUtility.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/PkgCmdID.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/PkgCmdID.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/PkgCmdID.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/PkgCmdID.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Properties/AssemblyInfo.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Properties/AssemblyInfo.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Properties/AssemblyInfo.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Properties/AssemblyInfo.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources.Designer.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources.Designer.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources.Designer.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources.Designer.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources.resx b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources.resx
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources.resx
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources.resx
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources/favicon_16x16.png b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources/favicon_16x16.png
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/Resources/favicon_16x16.png
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/Resources/favicon_16x16.png
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/SolutionUtility.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/SolutionUtility.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SystemUtility.cs b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/SystemUtility.cs
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SystemUtility.cs
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/SystemUtility.cs
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/VSPackage.resx b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/VSPackage.resx
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/VSPackage.resx
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/VSPackage.resx
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/coati.ico b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/coati.ico
similarity index 100%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/coati.ico
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/coati.ico
diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
similarity index 83%
rename from ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
rename to ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
index 4118fee5..13778c8e 100644
--- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/source.extension.vsixmanifest
+++ b/ide_plugins/vs/vs2015/CoatiPlugin/CoatiPlugin/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="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.5.1" Language="en-US" Publisher="Coati Software OG" />
+    <Identity Id="acf15780-03b5-440e-a41e-db79b7043fc2" Version="0.5.2" Language="en-US" Publisher="Coati Software OG" />
     <DisplayName>CoatiPlugin</DisplayName>
     <Description xml:space="preserve">This package allows Coati to communicate with Visual Studio and vice versa.
 More infos at www.coati.io</Description>
@@ -9,6 +9,8 @@ More infos at www.coati.io</Description>
   </Metadata>
   <Installation InstalledByMsi="false">
     <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />
+    <InstallationTarget Version="[12.0,13.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Community" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="4.5" />
diff --git a/ide_plugins/vs/coati_plugin_vs_2013.vsix b/ide_plugins/vs/vs_plugin.vsix
similarity index 76%
rename from ide_plugins/vs/coati_plugin_vs_2013.vsix
rename to ide_plugins/vs/vs_plugin.vsix
index 9bc48324..42afd975 100644
Binary files a/ide_plugins/vs/coati_plugin_vs_2013.vsix and b/ide_plugins/vs/vs_plugin.vsix differ