diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss
index da57e7ef1..3b1170d17 100644
--- a/Setup2/Cosmos.iss
+++ b/Setup2/Cosmos.iss
@@ -168,7 +168,7 @@ Source: ".\Build\VSIP\Cosmos.VS.Package.*"; DestDir: "{app}\Build\VSIP\"; Flags:
 Source: ".\Build\VSIP\Cosmos.VS.Windows.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.VS.Wizards.*"; DestDir: "{code:VSNET2010_PATH}\PrivateAssemblies"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.VS.XSharp.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
-Source: ".\Build\VSIP\Cosmos.Compiler.XSharp.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
+Source: ".\Build\VSIP\Cosmos.Compiler.XSharp.vsix"; DestDir: "{userappdata}\Local\Microsoft\VisualStudio\10.0\Extensions"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.Debug.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.Build.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
 Source: ".\Build\VSIP\Cosmos.Assembler.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
diff --git a/source/Cosmos.VS.ReadMe.html b/source/Cosmos.VS.ReadMe.html
index 597a9fce3..5845b2d8f 100644
--- a/source/Cosmos.VS.ReadMe.html
+++ b/source/Cosmos.VS.ReadMe.html
@@ -1,7 +1,7 @@
 <p>
     Projects that provide Visual Studio IDE support.</p>
-<h3>
-    Debugging</h3>
+<h2>
+    Debugging</h2>
 <p>
     Debugging VS packages can be a royal PITA. The hive can be used but install.bat 
     often requires it to be reset each time.</p>
@@ -18,7 +18,40 @@
 <p>
     Non hive:<br />
     C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.exe<br />
-    D:\source\Cosmos\source\Cosmos.sln</p>
+    <a href="file:///D:/source/Cosmos/source/Cosmos.sln">D:\source\Cosmos\source\Cosmos.sln</a></p>
+<h2>
+    Resources</h2>
+<h3>
+    VSIX</h3>
+<ul>
+    <li><a href="http://msdn.microsoft.com/en-us/library/ff363239.aspx">MSDN: VSIX 
+        Deployment</a></li>
+    <li><a href="http://superuser.com/questions/73675/how-do-i-install-a-vsix-file-in-visual-studio">
+        How do I deploy a VSIX file?</a></li>
+</ul>
+<h3>
+    MEF</h3>
+<ul>
+    <li>MSDN<ul>
+        <li><a href="http://code.msdn.microsoft.com/vsx">Visual Studio 2010 Editor 
+            Extensibility Samples</a></li>
+        <li><a href="http://msdn.microsoft.com/en-us/library/dd885242.aspx">Extending the 
+            editor</a></li>
+        <li><a href="http://msdn.microsoft.com/en-us/library/dd885013.aspx">Managed 
+            Extensibility Framework in the Editor</a></li>
+        <li><a href="http://msdn.microsoft.com/en-us/library/dd885122.aspx">Getting Started 
+            with Editor Extensions</a></li>
+        <li><a href="http://msdn.microsoft.com/en-us/library/dd393694.aspx">Visual Studio 
+            Extension Deployment</a></li>
+        </ul>
+    </li>
+    <li><a href="http://channel9.msdn.com/blogs/vsipmarketing/vsx212-adding-a-language-service-into-visual-studio-2010">
+        How to integrate a language service (Video)</a></li>
+    <li><a href="http://channel9.msdn.com/posts/VSIPMarketing/VSX212-Adding-a-Language-Service-into-Visual-Studio-2010/">
+        Chris Granger&#39;s talk on Language Integration in the 2010 Editor</a></li>
+    <li><a href="http://channel9.msdn.com/posts/VSIPMarketing/VSX103-Lighting-up-the-new-Visual-Studio-2010-Editor-with-Rich-Extensions/">
+        Chris Granger&#39;s talk on Lighting up the editor with extensions</a></li>
+</ul>
 <h2>
     Projects</h2>
 <h3>
diff --git a/source2/Users/Kudzu/Kudzu-Notes.html b/source2/Users/Kudzu/Kudzu-Notes.html
index 1e0605c74..a719dc6f3 100644
--- a/source2/Users/Kudzu/Kudzu-Notes.html
+++ b/source2/Users/Kudzu/Kudzu-Notes.html
@@ -43,11 +43,14 @@
                     http://www.google.com/url?sa=t&amp;rct=j&amp;q=&amp;esrc=s&amp;source=web&amp;cd=6&amp;ved=0CFsQFjAF&amp;url=http%3A%2F%2Fss.textcube.com%2Fblog%2F0%2F156%2Fattach%2FXXafvgVtXT.docx%2FVSWalkthroughs.docx&amp;ei=dw_RT4fCN4m69gTN2fxW&amp;usg=AFQjCNGU-npBhbcXkA2LQGWzZjSwN5MtFQ&amp;sig2=urj6u23uhEFp5mYfep_rIQ</a></li>
                 <li><a href="http://go4answers.webhost4life.com/Example/itagger-vs-iclassifier-5001.aspx">
                     http://go4answers.webhost4life.com/Example/itagger-vs-iclassifier-5001.aspx</a></li>
-                <li><a href="http://code.msdn.microsoft.com/vsx">http://code.msdn.microsoft.com/vsx</a></li>
-                <li><a href="http://editorsamples.codeplex.com/">http://editorsamples.codeplex.com/</a></li>
                 </ul>
             </li>
         </ul>
+        <ul>
+            <ul>
+                <li><a href="http://editorsamples.codeplex.com/">http://editorsamples.codeplex.com/</a></li>
+            </ul>
+        </ul>
         <li>Convert cxdb to sql compact and edm<ul>
             <li><a href="http://www.microsoft.com/download/en/details.aspx?id=17876">http://www.microsoft.com/download/en/details.aspx?id=17876</a></li>
             </ul>
diff --git a/source2/VSIP/Cosmos.VS.Package/source.extension.vsixmanifest b/source2/VSIP/Cosmos.VS.Package/source.extension.vsixmanifest
index beb3bc8b8..52eb38c36 100644
--- a/source2/VSIP/Cosmos.VS.Package/source.extension.vsixmanifest
+++ b/source2/VSIP/Cosmos.VS.Package/source.extension.vsixmanifest
@@ -1,27 +1,27 @@
 <?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="Cosmos.5db295fe-2bf6-4e35-a491-e3e4f0f2d5a9">
-		<Name>Cosmos</Name>
-		<Author>Cosmos</Author>
-		<Version>1.0</Version>
-		<Description xml:space="preserve">Empty VSIX Project.</Description>
-		<Locale>1033</Locale>
-		<Icon>..\..\Cosmos.ico</Icon>
-		<SupportedProducts>
-			<VisualStudio Version="10.0">
-				<Edition>Ultimate</Edition>
-				<Edition>Premium</Edition>
-				<Edition>Pro</Edition>
-				<Edition>Express_All</Edition>
-				<Edition>IntegratedShell</Edition>
-			</VisualStudio>
-		</SupportedProducts>
-		<SupportedFrameworkRuntimeEdition MinVersion="2.0" MaxVersion="4.0" />
-	</Identifier>
-	<References>
-		<Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-			<Name>Visual Studio MPF</Name>
-		</Reference>
-	</References>
-	<Content />
+  <Identifier Id="Cosmos.5db295fe-2bf6-4e35-a491-e3e4f0f2d5a9">
+    <Name>Cosmos</Name>
+    <Author>Cosmos</Author>
+    <Version>1.0</Version>
+    <Description xml:space="preserve">Cosmos VSIX Project</Description>
+    <Locale>1033</Locale>
+    <Icon>..\..\Cosmos.ico</Icon>
+    <SupportedProducts>
+      <VisualStudio Version="10.0">
+        <Edition>Ultimate</Edition>
+        <Edition>Premium</Edition>
+        <Edition>Pro</Edition>
+        <Edition>Express_All</Edition>
+        <Edition>IntegratedShell</Edition>
+      </VisualStudio>
+    </SupportedProducts>
+    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
+  </Identifier>
+  <References>
+    <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
+      <Name>Visual Studio MPF</Name>
+    </Reference>
+  </References>
+  <Content />
 </Vsix>
diff --git a/source2/VSIP/Cosmos.VS.XSharp/Cosmos.VS.XSharp.csproj b/source2/VSIP/Cosmos.VS.XSharp/Cosmos.VS.XSharp.csproj
index 6cf549770..2c51d04ef 100644
--- a/source2/VSIP/Cosmos.VS.XSharp/Cosmos.VS.XSharp.csproj
+++ b/source2/VSIP/Cosmos.VS.XSharp/Cosmos.VS.XSharp.csproj
@@ -75,6 +75,12 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Cosmos.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/source2/VSIP/Cosmos.VS.XSharp/Cosmos.ico b/source2/VSIP/Cosmos.VS.XSharp/Cosmos.ico
new file mode 100644
index 000000000..fcdc40183
Binary files /dev/null and b/source2/VSIP/Cosmos.VS.XSharp/Cosmos.ico differ
diff --git a/source2/VSIP/Cosmos.VS.XSharp/source.extension.vsixmanifest b/source2/VSIP/Cosmos.VS.XSharp/source.extension.vsixmanifest
index 6fb3a816f..6e6bdcd4f 100644
--- a/source2/VSIP/Cosmos.VS.XSharp/source.extension.vsixmanifest
+++ b/source2/VSIP/Cosmos.VS.XSharp/source.extension.vsixmanifest
@@ -4,11 +4,18 @@
     <Name>Cosmos.VS.XSharp</Name>
     <Author>Cosmos</Author>
     <Version>1.0</Version>
-    <Description xml:space="preserve">This is a sample classifier extension to the Visual Studio Editor.</Description>
+    <Description xml:space="preserve">Cosmos XSharp Editor Support</Description>
     <Locale>1033</Locale>
+    <MoreInfoUrl>http://www.GoCosmos.org/</MoreInfoUrl>
+    <Icon>Cosmos.ico</Icon>
     <SupportedProducts>
       <VisualStudio Version="10.0">
+        <Edition>Ultimate</Edition>
+        <Edition>Premium</Edition>
         <Edition>Pro</Edition>
+        <Edition>IntegratedShell</Edition>
+        <Edition>VBExpress</Edition>
+        <Edition>VCSExpress</Edition>
       </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />