diff --git a/ChangeLog.md b/ChangeLog.md
index 0f30b61a..fce85856 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,11 @@
 # Release Notes
 
+## 0.7.0 (2017-12-13)
+
+* Rewrite C++ snippets
+* Change shortcut for '...WithInitializer' snippets from '_' to 'x' (C# and VB)
+* Remove '...WithArguments' snippets and '...WithParameters' snippets (C# and VB)
+
 ## 0.6.0 (2017-09-24)
 
 ### New Shortcuts
diff --git a/source/Snippetica.VisualStudio.Dev/Properties/AssemblyInfo.cs b/source/Snippetica.VisualStudio.Dev/Properties/AssemblyInfo.cs
index 157461dc..9020625b 100644
--- a/source/Snippetica.VisualStudio.Dev/Properties/AssemblyInfo.cs
+++ b/source/Snippetica.VisualStudio.Dev/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.1")]
+[assembly: AssemblyVersion("0.7.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/source/Snippetica.VisualStudio.Dev/source.extension.vsixmanifest b/source/Snippetica.VisualStudio.Dev/source.extension.vsixmanifest
index 8c707c55..ca53666d 100644
--- a/source/Snippetica.VisualStudio.Dev/source.extension.vsixmanifest
+++ b/source/Snippetica.VisualStudio.Dev/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="ae12c77c-5384-4e1f-a148-26bf0fddaa33" Version="0.6.0" Language="en-US" Publisher="Josef Pihrt" />
+    <Identity Id="ae12c77c-5384-4e1f-a148-26bf0fddaa33" Version="0.7.0" Language="en-US" Publisher="Josef Pihrt" />
     <DisplayName>Snippetica.Dev</DisplayName>
     <Description xml:space="preserve">A collection of snippets for C#, VB, C++, HTML, XAML and XML.</Description>
     <MoreInfo>http://github.com/JosefPihrt/Snippetica</MoreInfo>
diff --git a/source/Snippetica.VisualStudio/Properties/AssemblyInfo.cs b/source/Snippetica.VisualStudio/Properties/AssemblyInfo.cs
index 3d048130..6881f2ff 100644
--- a/source/Snippetica.VisualStudio/Properties/AssemblyInfo.cs
+++ b/source/Snippetica.VisualStudio/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.1")]
+[assembly: AssemblyVersion("0.7.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/source/Snippetica.VisualStudio/Snippetica.VisualStudio.csproj b/source/Snippetica.VisualStudio/Snippetica.VisualStudio.csproj
index 43bc0bf3..b35be549 100644
--- a/source/Snippetica.VisualStudio/Snippetica.VisualStudio.csproj
+++ b/source/Snippetica.VisualStudio/Snippetica.VisualStudio.csproj
@@ -91,16 +91,6 @@
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Snippetica.Cpp\AlignAsKeyword">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Snippetica.Cpp\AlignAsKeyword">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Snippetica.CSharp\AttributeClass.snippet">
       <IncludeInVSIX>true</IncludeInVSIX>
diff --git a/source/Snippetica.VisualStudio/source.extension.vsixmanifest b/source/Snippetica.VisualStudio/source.extension.vsixmanifest
index 476081ea..1fe57d69 100644
--- a/source/Snippetica.VisualStudio/source.extension.vsixmanifest
+++ b/source/Snippetica.VisualStudio/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="5809355f-dd0b-4463-a439-46f547208e95" Version="0.6.0" Language="en-US" Publisher="Josef Pihrt" />
+    <Identity Id="5809355f-dd0b-4463-a439-46f547208e95" Version="0.7.0" Language="en-US" Publisher="Josef Pihrt" />
     <DisplayName>Snippetica</DisplayName>
     <Description xml:space="preserve">A collection of snippets for C#, VB, C++, HTML, XAML and XML.</Description>
     <MoreInfo>http://github.com/JosefPihrt/Snippetica</MoreInfo>
diff --git a/source/Snippetica.VisualStudioCode.Dev/Snippetica.CSharp.Dev/package/package.json b/source/Snippetica.VisualStudioCode.Dev/Snippetica.CSharp.Dev/package/package.json
index b5679b2a..4d33a27b 100644
--- a/source/Snippetica.VisualStudioCode.Dev/Snippetica.CSharp.Dev/package/package.json
+++ b/source/Snippetica.VisualStudioCode.Dev/Snippetica.CSharp.Dev/package/package.json
@@ -4,7 +4,7 @@
   "displayName": "Snippetica for C#",
   "description": "A collection of snippets for C#.",
   "icon": "images/icon.png",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Josef Pihrt",
   "license": "SEE LICENSE IN LICENSE.TXT",
   "homepage": "http://github.com/josefpihrt/snippetica/blob/master/source/Snippetica.VisualStudioCode/Snippetica.CSharp.Dev/README.md",
diff --git a/source/Snippetica.VisualStudioCode.Dev/Snippetica.VisualBasic.Dev/package/package.json b/source/Snippetica.VisualStudioCode.Dev/Snippetica.VisualBasic.Dev/package/package.json
index 6726521a..138a28ae 100644
--- a/source/Snippetica.VisualStudioCode.Dev/Snippetica.VisualBasic.Dev/package/package.json
+++ b/source/Snippetica.VisualStudioCode.Dev/Snippetica.VisualBasic.Dev/package/package.json
@@ -4,7 +4,7 @@
   "displayName": "Snippetica for VB",
   "description": "A collection of snippets for VB.",
   "icon": "images/icon.png",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Josef Pihrt",
   "license": "SEE LICENSE IN LICENSE.TXT",
   "homepage": "http://github.com/josefpihrt/snippetica/blob/master/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic.Dev/README.md",
diff --git a/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/CHANGELOG.md b/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/CHANGELOG.md
index e69de29b..a358da41 100644
--- a/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/CHANGELOG.md
+++ b/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/CHANGELOG.md
@@ -0,0 +1,4 @@
+## 0.7.0 (2017-12-13)
+
+* Change shortcut for '...WithInitializer' snippets from '_' to 'x'
+* Remove '...WithArguments' snippets and '...WithParameters' snippets
diff --git a/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/package.json b/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/package.json
index 4f665f97..33fdf6d5 100644
--- a/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/package.json
+++ b/source/Snippetica.VisualStudioCode/Snippetica.CSharp/package/package.json
@@ -4,7 +4,7 @@
   "displayName": "Snippetica for C#",
   "description": "A collection of snippets for C#.",
   "icon": "images/icon.png",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Josef Pihrt",
   "license": "SEE LICENSE IN LICENSE.TXT",
   "homepage": "http://github.com/josefpihrt/snippetica/blob/master/source/Snippetica.VisualStudioCode/Snippetica.CSharp/README.md",
diff --git a/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic/package/package.json b/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic/package/package.json
index f46c2022..4af84ca7 100644
--- a/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic/package/package.json
+++ b/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic/package/package.json
@@ -4,7 +4,7 @@
   "displayName": "Snippetica for VB",
   "description": "A collection of snippets for VB.",
   "icon": "images/icon.png",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "author": "Josef Pihrt",
   "license": "SEE LICENSE IN LICENSE.TXT",
   "homepage": "http://github.com/josefpihrt/snippetica/blob/master/source/Snippetica.VisualStudioCode/Snippetica.VisualBasic/README.md",
diff --git a/source/Snippetica/Snippetica.csproj b/source/Snippetica/Snippetica.csproj
index 3c507c73..0b069e22 100644
--- a/source/Snippetica/Snippetica.csproj
+++ b/source/Snippetica/Snippetica.csproj
@@ -55,6 +55,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>..\global.ruleset</CodeAnalysisRuleSet>
+    <CreateVsixContainer>False</CreateVsixContainer>
+    <DeployExtension>False</DeployExtension>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />