diff --git a/ICSharpCode.TextEditor.Sample/ICSharpCode.TextEditor.Sample.csproj b/ICSharpCode.TextEditor.Sample/ICSharpCode.TextEditor.Sample.csproj
index 791afc3..817b0ab 100644
--- a/ICSharpCode.TextEditor.Sample/ICSharpCode.TextEditor.Sample.csproj
+++ b/ICSharpCode.TextEditor.Sample/ICSharpCode.TextEditor.Sample.csproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>ICSharpCode.TextEditor.Sample</RootNamespace>
     <AssemblyName>ICSharpCode.TextEditor.Sample</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <RuntimeIdentifier>win</RuntimeIdentifier>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -57,5 +58,8 @@
       <Name>ICSharpCode.TextEditor</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ICSharpCode.TextEditor.Sample/app.config b/ICSharpCode.TextEditor.Sample/app.config
new file mode 100644
index 0000000..3dbff35
--- /dev/null
+++ b/ICSharpCode.TextEditor.Sample/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
diff --git a/Project/Resources/VBNET.xshd b/Project/Resources/VB.NET.xshd
similarity index 100%
rename from Project/Resources/VBNET.xshd
rename to Project/Resources/VB.NET.xshd
diff --git a/Test/HighlightingManagerTests.cs b/Test/HighlightingManagerTests.cs
index 2e16a96..f78f165 100644
--- a/Test/HighlightingManagerTests.cs
+++ b/Test/HighlightingManagerTests.cs
@@ -1,5 +1,8 @@
 using ICSharpCode.TextEditor.Document;
 using NUnit.Framework;
+using System.Linq;
+using System.Reflection;
+using System.Xml.Linq;
 
 namespace ICSharpCode.TextEditor.Tests
 {
@@ -23,5 +26,29 @@ namespace ICSharpCode.TextEditor.Tests
             IHighlightingStrategy highlightingStrategy = HighlightingManager.Manager.FindHighlighterForFile("test.unkown");
             Assert.AreEqual("Default", highlightingStrategy.Name);
         }
+
+        [Test]
+        public void ResourceStreamNamesMatchSyntaxNodes()
+        {
+            Assembly assembly = typeof(ICSharpCode.TextEditor.Document.ResourceSyntaxModeProvider).Assembly;
+            var resources = assembly.GetManifestResourceNames();
+            var syntaxNodesResource = resources.First(r => r.Contains("SyntaxModes"));
+            var xmlModes = XElement.Load(assembly.GetManifestResourceStream(syntaxNodesResource)).Elements("Mode");
+            var resourcesToCheck = resources.Where(r => r.EndsWith("xshd"));
+
+            var matched = from xml in xmlModes
+                          join res in resourcesToCheck on xml.Attribute("file").Value equals
+                          res.Replace("ICSharpCode.TextEditor.Resources.", "")
+                          select new { ResourceName = res, XMLModeFile = xml.Attribute("file").Value };
+
+            var missingInXML = resourcesToCheck.Except(matched.Select(m => m.ResourceName));
+
+            var missingInResources = from nd in xmlModes
+                                     where !matched.Select(m => m.XMLModeFile).Contains(nd.Attribute("file").Value)
+                                     select nd.Attribute("file").Value;
+
+            Assert.That(!missingInXML.Any(), "The SyntaxNodes.xml file is out of sync with the actual resources. Check the following resource names that don't exist in xml file. {0}", string.Join(",", missingInXML));
+            Assert.That(!missingInResources.Any(), "The SyntaxNodes.xml file is out of sync with the actual resources. Check the following resource names that don't exist in embedded resources. {0}", string.Join(",", missingInResources));
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/Test/ICSharpCode.TextEditor.Tests.csproj b/Test/ICSharpCode.TextEditor.Tests.csproj
index 17bc7bb..90f943d 100644
--- a/Test/ICSharpCode.TextEditor.Tests.csproj
+++ b/Test/ICSharpCode.TextEditor.Tests.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -21,18 +21,21 @@
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <RuntimeIdentifier>win</RuntimeIdentifier>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DefineConstants>DEBUG</DefineConstants>
     <OutputPath>bin\UnitTests\</OutputPath>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -52,6 +55,8 @@
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/Test/packages.config b/Test/packages.config
index c0c5f5a..2cbd09d 100644
--- a/Test/packages.config
+++ b/Test/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
   <package id="NUnit" version="2.6.1" targetFramework="net20" />
 </packages>
\ No newline at end of file