diff --git a/src/SparkSense.sln b/src/SparkSense.sln
index 064d5d0..8a9d632 100644
--- a/src/SparkSense.sln
+++ b/src/SparkSense.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{09797D66-0261-4946-9C9A-08FA24CD5318}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparkSense", "SparkSense\SparkSense.csproj", "{6E9BC746-755B-460E-8556-A73985E32BAE}"
diff --git a/src/SparkSense/SparkSense.csproj b/src/SparkSense/SparkSense.csproj
index 931d849..32161cc 100644
--- a/src/SparkSense/SparkSense.csproj
+++ b/src/SparkSense/SparkSense.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,6 +15,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -163,10 +165,14 @@
     <Page Include="Presenter\SparkSenseView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="Resources\SparkSenseViewResources.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
@@ -207,8 +213,13 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
   </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" Condition="false" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/SparkSense/source.extension.vsixmanifest b/src/SparkSense/source.extension.vsixmanifest
index 71fe457..02404db 100644
--- a/src/SparkSense/source.extension.vsixmanifest
+++ b/src/SparkSense/source.extension.vsixmanifest
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="SparkSense.5476bd82-fe0d-4f4f-aaa6-ce32da05b8db">
-    <Name>SparkSense</Name>
-    <Author>Robert Greyling</Author>
-    <Version>0.5</Version>
-    <Description xml:space="preserve">This is a Spark extension to the Visual Studio 2010 Editor.</Description>
-    <Locale>1033</Locale>
-    <MoreInfoUrl>http://blog.robertgreyling.com</MoreInfoUrl>
-    <License>license.txt</License>
-    <Icon>SparkIcon.png</Icon>
-    <PreviewImage>SparkLogo.png</PreviewImage>
-    <SupportedProducts>
-      <VisualStudio Version="10.0">
-        <Edition>Pro</Edition>
-      </VisualStudio>
-    </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
-  </Identifier>
-  <References />
-  <Content>
-    <MefComponent>|%CurrentProject%|</MefComponent>
-  </Content>
-</Vsix>
+<PackageManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 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 Publisher="Robert Greyling" Id="SparkSense.5476bd82-fe0d-4f4f-aaa6-ce32da05b8db" Version="0.5" Language="en-US" />
+		<DisplayName>SparkSense</DisplayName>
+		<Description xml:space="preserve" >This is a Spark extension to the Visual Studio Editor.</Description>
+		<MoreInfo>http://blog.robertgreyling.com</MoreInfo>
+		<License>license.txt</License>
+		<Icon>SparkIcon.png</Icon>
+		<PreviewImage>SparkLogo.png</PreviewImage>
+	</Metadata>
+	<Installation>
+		<InstallationTarget Version="[10.0,13.0)" Id="Microsoft.VisualStudio.Pro" />
+	</Installation>
+	<Assets>
+		<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+	</Assets>
+</PackageManifest>