diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
index e1a25ee6..83e70c36 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_Linux.csproj
@@ -108,6 +108,7 @@
     <Compile Include="IContentProcessor.cs" />
     <Compile Include="Importer\TextureImporter.cs" />
     <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="Importer\XmlImporter.cs" />
     <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
@@ -149,6 +150,7 @@
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
+    <Compile Include="Serialization\Compiler\GraphicTypeWriters\Texture2DWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\SpriteFontWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
@@ -186,13 +188,14 @@
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
+    <Compile Include="Serialization\XmlReaderExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ANX.Framework\ANX.Framework_Linux.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3.csproj">
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_Linux.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
       <Name>ANX.RenderSystem.GL3</Name>
     </ProjectReference>
diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
index dd0ff080..cc29aa64 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
@@ -109,6 +109,7 @@
     <Compile Include="IContentProcessor.cs" />
     <Compile Include="Importer\TextureImporter.cs" />
     <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="Importer\XmlImporter.cs" />
     <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
@@ -150,6 +151,7 @@
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
+    <Compile Include="Serialization\Compiler\GraphicTypeWriters\Texture2DWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\SpriteFontWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
@@ -187,17 +189,18 @@
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
+    <Compile Include="Serialization\XmlReaderExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ANX.Framework\ANX.Framework_PSVita.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_PSVita.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
+      <Name>ANX.RenderSystem.GL3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SoundSystems\WaveUtils\WaveUtils_PSVita.csproj">
+    <ProjectReference Include="..\Support\WaveUtils\WaveUtils_PSVita.csproj">
       <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
       <Name>WaveUtils</Name>
     </ProjectReference>
diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
index 3a6a7830..0c973d6b 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_WindowsMetro.csproj
@@ -110,6 +110,7 @@
     <Compile Include="IContentProcessor.cs" />
     <Compile Include="Importer\TextureImporter.cs" />
     <Compile Include="Importer\WavImporter.cs" />
+    <Compile Include="Importer\XmlImporter.cs" />
     <Compile Include="InvalidContentException.cs" />
     <Compile Include="NamedValueDictionary.cs" />
     <Compile Include="OpaqueDataDictionary.cs" />
@@ -151,6 +152,7 @@
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
+    <Compile Include="Serialization\Compiler\GraphicTypeWriters\Texture2DWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\SpriteFontWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
@@ -188,13 +190,14 @@
     <Compile Include="Tasks\ImporterManager.cs" />
     <Compile Include="Tasks\ProcessorManager.cs" />
     <Compile Include="VideoContent.cs" />
+    <Compile Include="Serialization\XmlReaderExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SoundSystems\WaveUtils\WaveUtils_WindowsMetro.csproj">
+    <ProjectReference Include="..\Support\WaveUtils\WaveUtils_WindowsMetro.csproj">
       <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
       <Name>WaveUtils</Name>
     </ProjectReference>
diff --git a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_Linux.csproj b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_Linux.csproj
index aaa67ab3..75a91586 100644
--- a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_Linux.csproj
+++ b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_Linux.csproj
@@ -62,7 +62,7 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3.csproj">
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_Linux.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
       <Name>ANX.RenderSystem.GL3</Name>
     </ProjectReference>
diff --git a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_PSVita.csproj b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_PSVita.csproj
index d5eafd17..764a9ae7 100644
--- a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_PSVita.csproj
+++ b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_PSVita.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -65,17 +65,17 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.BaseDirectX\ANX.BaseDirectX_PSVita.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
+    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_PSVita.csproj">
+      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
+      <Name>ANX.RenderSystem.GL3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    <ProjectReference Include="..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
+      <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
+      <Name>ANX.RenderSystem.Windows.DX11</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
diff --git a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj
index 2bd30525..914f2e32 100644
--- a/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj
+++ b/ANX.Framework.ContentPipeline/ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -63,10 +63,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.BaseDirectX\ANX.BaseDirectX_WindowsMetro.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/ANX.Framework/ANX.Framework_PSVita.csproj b/ANX.Framework/ANX.Framework_PSVita.csproj
index 3803e3e6..95e7c57d 100644
--- a/ANX.Framework/ANX.Framework_PSVita.csproj
+++ b/ANX.Framework/ANX.Framework_PSVita.csproj
@@ -441,6 +441,8 @@
     <Compile Include="NonXNA\PlatformSystem\INativeGameTimer.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeContentManager.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeMediaLibrary.cs" />
+    <Compile Include="NonXNA\PlatformSystem\PlatformSystem.cs" />
+    <Compile Include="NonXNA\PlatformSystem\PlatformSystemInstanceException.cs" />
     <Compile Include="NonXNA\Reflection\AssemblyLoader.cs" />
     <Compile Include="NonXNA\RenderSystem\INativeConstantBuffer.cs" />
     <Compile Include="NonXNA\RenderSystem\IOcclusionQuery.cs" />
@@ -451,7 +453,7 @@
     <Compile Include="NonXNA\Windows8\IServiceProvider.cs" />
     <Compile Include="NonXNA\NoInputDeviceException.cs" />
     <Compile Include="NonXNA\OSInformation.cs" />
-    <Compile Include="NonXNA\PlatformSystem\IPlatformSystemCreator.cs" />
+    <Compile Include="NonXNA\PlatformSystem\IPlatformSystem.cs" />
     <Compile Include="NonXNA\RenderSystem\EffectProcessorOutputFormat.cs" />
     <Compile Include="NonXNA\ICreator.cs" />
     <Compile Include="NonXNA\InputSystem\IGamePad.cs" />
diff --git a/ANX.Framework/Graphics/SkinnedEffect.cs b/ANX.Framework/Graphics/SkinnedEffect.cs
index ab342015..0a3a8dca 100644
--- a/ANX.Framework/Graphics/SkinnedEffect.cs
+++ b/ANX.Framework/Graphics/SkinnedEffect.cs
@@ -26,7 +26,7 @@ namespace ANX.Framework.Graphics
 		private Vector3 fogColor;
 		private Vector3 emissiveColor;
 		private Vector3 ambientLightColor;
-		private Matrix[] bones;
+		private readonly Matrix[] bones;
 		private int weightsPerBone;
 		#endregion
 
diff --git a/ANX.Framework_Linux.sln b/ANX.Framework_Linux.sln
index b6c6e206..c2034465 100644
--- a/ANX.Framework_Linux.sln
+++ b/ANX.Framework_Linux.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework_Linux.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter", "ANX.Framework.TestCenter\ANX.Framework.TestCenter_Linux.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
@@ -193,7 +193,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.GL3", "Ren
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_Linux.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI", "InputSystems\ANX.InpuDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI_Linux.csproj", "{F5819204-4882-4F33-B973-DE6762C9682F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI", "InputSystems\ANX.InputDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI_Linux.csproj", "{628AB80A-B1B9-4878-A810-7A58D4840F60}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -960,20 +960,26 @@ Global
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x64.ActiveCfg = Release|Any CPU
 		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x64.ActiveCfg = Release|Any CPU
-		{F5819204-4882-4F33-B973-DE6762C9682F}.Release|x86.ActiveCfg = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.ActiveCfg = Debug|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.Build.0 = Debug|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.ActiveCfg = Debug|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.Build.0 = Debug|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x86.ActiveCfg = Debug|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x86.Build.0 = Debug|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.ActiveCfg = Release|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.Build.0 = Release|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.Build.0 = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.ActiveCfg = Release|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.Build.0 = Release|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.ActiveCfg = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1019,7 +1025,7 @@ Global
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{5040A9C7-6DEC-4613-8586-A598C4070B35} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{566293A4-1187-4289-A28C-C74B499D46AA} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
-		{F5819204-4882-4F33-B973-DE6762C9682F} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
+		{628AB80A-B1B9-4878-A810-7A58D4840F60} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
diff --git a/ANX.Framework_PSVita.sln b/ANX.Framework_PSVita.sln
index 2ad78ff1..e96ff06e 100644
--- a/ANX.Framework_PSVita.sln
+++ b/ANX.Framework_PSVita.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework_PSVita.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
 EndProject
@@ -77,10 +77,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XNA", "XNA", "{BD648BB8-EF2
 		shader\XNA\Structures.fxh = shader\XNA\Structures.fxh
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.GL3", "RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX11", "RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj", "{B30DE9C2-0926-46B6-8351-9AF276C472D5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{82CDEC51-2E62-4D6D-8A89-8E0F68A9722B}"
@@ -185,577 +181,805 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\Audi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "SoundSystems\WaveUtils\WaveUtils_PSVita.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DualTextureSample", "Samples\DualTextureSample\DualTextureSample_PSVita.csproj", "{9259CC4E-AE6B-403C-8FAB-2408448C3935}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.BaseDirectX", "RenderSystems\ANX.BaseDirectX\ANX.BaseDirectX_PSVita.csproj", "{A4D3AD34-E49C-4142-8620-2AFF44ED6719}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicEffectSample", "Samples\BasicEffectSample\BasicEffectSample_PSVita.csproj", "{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support", "Support", "{3E29A6C6-9487-46A7-A161-D8DB84514933}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "Support\WaveUtils\WaveUtils_PSVita.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.GL3", "RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_PSVita.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI", "InputSystems\ANX.InputDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI_PSVita.csproj", "{628AB80A-B1B9-4878-A810-7A58D4840F60}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|ARM.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|x64.ActiveCfg = Release|Any CPU
 		{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}.Release|x86.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|ARM.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|x64.ActiveCfg = Release|Any CPU
 		{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}.Release|x86.ActiveCfg = Release|Any CPU
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Any CPU.Build.0 = Debug|x86
+		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|ARM.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x64.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x86.ActiveCfg = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Debug|x86.Build.0 = Debug|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Any CPU.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Any CPU.Build.0 = Release|x86
+		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|ARM.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|Mixed Platforms.Build.0 = Release|x86
+		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x64.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x86.ActiveCfg = Release|x86
 		{ECBF60CB-1CF0-4F92-8963-E73115B04B43}.Release|x86.Build.0 = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Any CPU.Build.0 = Debug|x86
+		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|ARM.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x64.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x86.ActiveCfg = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Debug|x86.Build.0 = Debug|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Any CPU.ActiveCfg = Release|x86
+		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|ARM.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x64.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x86.ActiveCfg = Release|x86
 		{9D8DC781-2E0D-4348-BAD9-745F91428A3F}.Release|x86.Build.0 = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Any CPU.Build.0 = Debug|x86
+		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|ARM.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x64.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x86.ActiveCfg = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Debug|x86.Build.0 = Debug|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Any CPU.ActiveCfg = Release|x86
+		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|ARM.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|Mixed Platforms.Build.0 = Release|x86
+		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x64.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x86.ActiveCfg = Release|x86
 		{F945515B-394D-4ED4-80E0-98EB59B69D24}.Release|x86.Build.0 = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Any CPU.Build.0 = Debug|x86
+		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|ARM.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x64.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x86.ActiveCfg = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Debug|x86.Build.0 = Debug|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Any CPU.ActiveCfg = Release|x86
+		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|ARM.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|Mixed Platforms.Build.0 = Release|x86
+		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x64.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x86.ActiveCfg = Release|x86
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}.Release|x86.Build.0 = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Any CPU.Build.0 = Debug|x86
+		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|ARM.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x64.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.ActiveCfg = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Debug|x86.Build.0 = Debug|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Any CPU.ActiveCfg = Release|x86
+		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|ARM.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|Mixed Platforms.Build.0 = Release|x86
+		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x64.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.ActiveCfg = Release|x86
 		{BC79B021-10E4-4D01-945A-7048FFF53A22}.Release|x86.Build.0 = Release|x86
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|ARM.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x64.ActiveCfg = Debug|Any CPU
 		{FA6E229D-4504-47B1-8A23-2D3FCC13F778}.Release|x86.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|ARM.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|x64.ActiveCfg = Release|Any CPU
 		{6A582788-C4D2-410C-96CD-177F75712D65}.Release|x86.ActiveCfg = Release|Any CPU
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Any CPU.Build.0 = Debug|x86
+		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|ARM.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x64.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x86.ActiveCfg = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Debug|x86.Build.0 = Debug|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Any CPU.ActiveCfg = Release|x86
+		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|ARM.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x64.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x86.ActiveCfg = Release|x86
 		{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}.Release|x86.Build.0 = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Any CPU.Build.0 = Debug|x86
+		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|ARM.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x64.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x86.ActiveCfg = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Debug|x86.Build.0 = Debug|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Any CPU.ActiveCfg = Release|x86
+		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|ARM.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x64.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x86.ActiveCfg = Release|x86
 		{B5209A04-B2F8-4033-A5E7-545BE771214C}.Release|x86.Build.0 = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Any CPU.Build.0 = Debug|x86
+		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|ARM.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x64.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x86.ActiveCfg = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Debug|x86.Build.0 = Debug|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Any CPU.ActiveCfg = Release|x86
+		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|ARM.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|Mixed Platforms.Build.0 = Release|x86
+		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x64.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x86.ActiveCfg = Release|x86
 		{A42413A9-5189-40CB-AACA-D50F24865431}.Release|x86.Build.0 = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Any CPU.Build.0 = Debug|x86
+		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|ARM.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x64.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x86.ActiveCfg = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Debug|x86.Build.0 = Debug|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Any CPU.ActiveCfg = Release|x86
+		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|ARM.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x64.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.Build.0 = Release|x86
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.Build.0 = Debug|x86
+		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|ARM.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x64.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x86.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|x86.Build.0 = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Any CPU.ActiveCfg = Release|x86
+		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|ARM.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|Mixed Platforms.Build.0 = Release|x86
+		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x64.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x86.ActiveCfg = Release|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Release|x86.Build.0 = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Any CPU.Build.0 = Debug|x86
+		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|ARM.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x64.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x86.ActiveCfg = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Debug|x86.Build.0 = Debug|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Any CPU.ActiveCfg = Release|x86
+		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|ARM.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|Mixed Platforms.Build.0 = Release|x86
+		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x64.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x86.ActiveCfg = Release|x86
 		{05233BB1-444F-43F6-A3DF-B82AA924E094}.Release|x86.Build.0 = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Any CPU.Build.0 = Debug|x86
+		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|ARM.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x64.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x86.ActiveCfg = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Debug|x86.Build.0 = Debug|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Any CPU.ActiveCfg = Release|x86
+		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|ARM.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|Mixed Platforms.Build.0 = Release|x86
+		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x64.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x86.ActiveCfg = Release|x86
 		{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}.Release|x86.Build.0 = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Any CPU.Build.0 = Debug|x86
+		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|ARM.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x64.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x86.ActiveCfg = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Debug|x86.Build.0 = Debug|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Any CPU.ActiveCfg = Release|x86
+		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|ARM.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|Mixed Platforms.Build.0 = Release|x86
+		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x64.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x86.ActiveCfg = Release|x86
 		{41E6C2CF-51EA-4D8E-96AE-739CA3951766}.Release|x86.Build.0 = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Any CPU.Build.0 = Debug|x86
+		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|ARM.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x64.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x86.ActiveCfg = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Debug|x86.Build.0 = Debug|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Any CPU.ActiveCfg = Release|x86
+		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|ARM.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|Mixed Platforms.Build.0 = Release|x86
+		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x64.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.ActiveCfg = Release|x86
 		{57097B7A-A283-4409-8AAC-35BF0F458657}.Release|x86.Build.0 = Release|x86
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|x64.ActiveCfg = Release|Any CPU
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|x64.ActiveCfg = Release|Any CPU
 		{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|ARM.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|x64.ActiveCfg = Release|Any CPU
 		{FF0AB665-2796-4354-9630-76C2751DB3C2}.Release|x86.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|ARM.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|x64.ActiveCfg = Release|Any CPU
 		{49066074-3B7B-4A55-B122-6BD33AB73558}.Release|x86.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|ARM.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|x64.ActiveCfg = Release|Any CPU
 		{60D08399-244F-46A3-91F1-4CFD26D961A3}.Release|x86.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|ARM.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x64.ActiveCfg = Release|Any CPU
 		{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}.Release|x86.ActiveCfg = Release|Any CPU
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Any CPU.Build.0 = Debug|x86
+		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|ARM.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x64.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.ActiveCfg = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Debug|x86.Build.0 = Debug|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Any CPU.ActiveCfg = Release|x86
+		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|ARM.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|Mixed Platforms.Build.0 = Release|x86
+		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x64.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.ActiveCfg = Release|x86
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549}.Release|x86.Build.0 = Release|x86
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|ARM.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|x64.ActiveCfg = Release|Any CPU
 		{5040A9C7-6DEC-4613-8586-A598C4070B35}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Any CPU.Build.0 = Debug|x86
+		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|ARM.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x64.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x86.ActiveCfg = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Debug|x86.Build.0 = Debug|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Any CPU.ActiveCfg = Release|x86
+		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|ARM.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x64.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.Build.0 = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.Build.0 = Debug|x86
+		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|ARM.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x64.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x86.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|x86.Build.0 = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Any CPU.ActiveCfg = Release|x86
+		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|ARM.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|Mixed Platforms.Build.0 = Release|x86
+		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x64.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x86.ActiveCfg = Release|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Release|x86.Build.0 = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Any CPU.Build.0 = Debug|x86
+		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|ARM.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x64.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x86.ActiveCfg = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Debug|x86.Build.0 = Debug|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Any CPU.ActiveCfg = Release|x86
+		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|ARM.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|Mixed Platforms.Build.0 = Release|x86
+		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x64.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x86.ActiveCfg = Release|x86
 		{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}.Release|x86.Build.0 = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Any CPU.Build.0 = Debug|x86
+		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|ARM.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x64.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.ActiveCfg = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Debug|x86.Build.0 = Debug|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Any CPU.ActiveCfg = Release|x86
+		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|ARM.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|Mixed Platforms.Build.0 = Release|x86
+		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x64.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.ActiveCfg = Release|x86
 		{ED081799-AB02-4793-96F8-F9EA7F3192E3}.Release|x86.Build.0 = Release|x86
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|ARM.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|x64.ActiveCfg = Release|Any CPU
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|ARM.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|x64.ActiveCfg = Release|Any CPU
 		{04F6041E-475E-4B2A-A889-6A33EABD718B}.Release|x86.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|x64.ActiveCfg = Release|Any CPU
 		{2B6D0EFF-7874-495F-9226-873ED9649C60}.Release|x86.ActiveCfg = Release|Any CPU
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Any CPU.Build.0 = Debug|x86
+		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|ARM.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x64.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x86.ActiveCfg = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Debug|x86.Build.0 = Debug|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Any CPU.ActiveCfg = Release|x86
+		{160150D5-38E6-482D-97F5-2624F322A854}.Release|ARM.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|Mixed Platforms.Build.0 = Release|x86
+		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x64.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x86.ActiveCfg = Release|x86
 		{160150D5-38E6-482D-97F5-2624F322A854}.Release|x86.Build.0 = Release|x86
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|x64.ActiveCfg = Release|Any CPU
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}.Release|x86.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|x64.ActiveCfg = Release|Any CPU
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}.Release|x86.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|ARM.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|x64.ActiveCfg = Release|Any CPU
 		{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}.Release|x86.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|ARM.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|x64.ActiveCfg = Release|Any CPU
 		{9588B0C3-E03A-4C71-89A4-2C8685D426F1}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|ARM.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|x64.ActiveCfg = Release|Any CPU
 		{F9177943-1590-49AE-987D-D6FAE30D96DD}.Release|x86.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|ARM.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|x64.ActiveCfg = Release|Any CPU
 		{47B802CC-069D-431E-BF15-E574EDD3BA5D}.Release|x86.ActiveCfg = Release|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Any CPU.Build.0 = Debug|x86
+		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x86.ActiveCfg = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Debug|x86.Build.0 = Debug|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Any CPU.ActiveCfg = Release|x86
+		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|ARM.ActiveCfg = Release|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|Mixed Platforms.Build.0 = Release|x86
+		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x64.ActiveCfg = Release|Any CPU
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x86.ActiveCfg = Release|x86
 		{10F7894D-E8B5-4DCA-BB08-5C99FA792388}.Release|x86.Build.0 = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Any CPU.Build.0 = Debug|x86
+		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|ARM.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x64.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x86.ActiveCfg = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Debug|x86.Build.0 = Debug|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Any CPU.ActiveCfg = Release|x86
+		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|ARM.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|Mixed Platforms.Build.0 = Release|x86
+		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x64.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x86.ActiveCfg = Release|x86
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF}.Release|x86.Build.0 = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Any CPU.Build.0 = Debug|x86
+		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|ARM.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x64.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x86.ActiveCfg = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Debug|x86.Build.0 = Debug|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Any CPU.ActiveCfg = Release|x86
+		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|ARM.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|Mixed Platforms.Build.0 = Release|x86
+		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x64.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x86.ActiveCfg = Release|x86
 		{14B39F89-C9B0-407E-877A-B515C985E96E}.Release|x86.Build.0 = Release|x86
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|ARM.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{566293A4-1187-4289-A28C-C74B499D46AA}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|ARM.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x64.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x86.ActiveCfg = Release|Any CPU
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Any CPU.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|ARM.ActiveCfg = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x64.ActiveCfg = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.ActiveCfg = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Debug|x86.Build.0 = Debug|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Any CPU.ActiveCfg = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|ARM.ActiveCfg = Release|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x64.ActiveCfg = Release|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
 		{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|ARM.ActiveCfg = Debug|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|ARM.ActiveCfg = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Any CPU.Build.0 = Debug|x86
+		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|ARM.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|x64.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|x86.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|x86.Build.0 = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|Any CPU.ActiveCfg = Release|x86
+		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|ARM.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x64.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x86.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x86.Build.0 = Release|x86
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|x86.ActiveCfg = Release|Any CPU
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Any CPU.Build.0 = Debug|x86
+		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|ARM.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|x64.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|x86.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|x86.Build.0 = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|Any CPU.ActiveCfg = Release|x86
+		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|ARM.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|Mixed Platforms.Build.0 = Release|x86
+		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x64.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x86.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x86.Build.0 = Release|x86
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.ActiveCfg = Debug|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.Build.0 = Debug|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.ActiveCfg = Debug|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.Build.0 = Debug|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x86.ActiveCfg = Debug|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x86.Build.0 = Debug|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.ActiveCfg = Release|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.Build.0 = Release|ARM
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.Build.0 = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.ActiveCfg = Release|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.Build.0 = Release|x64
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.ActiveCfg = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -771,12 +995,11 @@ Global
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
-		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{FF0AB665-2796-4354-9630-76C2751DB3C2} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
+		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{F945515B-394D-4ED4-80E0-98EB59B69D24} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{BC79B021-10E4-4D01-945A-7048FFF53A22} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
@@ -802,10 +1025,10 @@ Global
 		{E5D69E75-D77C-493F-BBDA-6F9E73B82549} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{5040A9C7-6DEC-4613-8586-A598C4070B35} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{566293A4-1187-4289-A28C-C74B499D46AA} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
+		{628AB80A-B1B9-4878-A810-7A58D4840F60} = {7AD65E6B-2A48-437F-81D9-4CA9C9A85C64}
 		{6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{E4FFD875-95FC-48F2-8B6D-8483D0B71666} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{BD648BB8-EF28-453C-B4F5-EE3C93EB4DAF} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
@@ -815,6 +1038,7 @@ Global
 		{04F6041E-475E-4B2A-A889-6A33EABD718B} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2B6D0EFF-7874-495F-9226-873ED9649C60} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {3E29A6C6-9487-46A7-A161-D8DB84514933}
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True
diff --git a/ANX.Framework_WindowsMetro.sln b/ANX.Framework_WindowsMetro.sln
index c18f4c89..d6f50888 100644
--- a/ANX.Framework_WindowsMetro.sln
+++ b/ANX.Framework_WindowsMetro.sln
@@ -1,10 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework_WindowsMetro", "ANX.Framework\ANX.Framework_WindowsMetro.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework_WindowsMetro.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter_WindowsMetro", "ANX.Framework.TestCenter\ANX.Framework.TestCenter_WindowsMetro.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter", "ANX.Framework.TestCenter\ANX.Framework.TestCenter_WindowsMetro.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.ContentPipeline.Extensions_WindowsMetro", "ANX.Framework.ContentPipeline\ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj", "{ECBF60CB-1CF0-4F92-8963-E73115B04B43}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.ContentPipeline.Extensions", "ANX.Framework.ContentPipeline\ANX.Framework.ContentPipeline.Extensions_WindowsMetro.csproj", "{ECBF60CB-1CF0-4F92-8963-E73115B04B43}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B24A8593-562A-4A25-BB08-46C163F10F3F}"
 EndProject
@@ -17,11 +17,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{9B0D
 		Samples\SampleCatalog.xml = Samples\SampleCatalog.xml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VertexIndexBuffer_WindowsMetro", "Samples\VertexIndexBuffer\VertexIndexBuffer_WindowsMetro.csproj", "{F945515B-394D-4ED4-80E0-98EB59B69D24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VertexIndexBuffer", "Samples\VertexIndexBuffer\VertexIndexBuffer_WindowsMetro.csproj", "{F945515B-394D-4ED4-80E0-98EB59B69D24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSprite_WindowsMetro", "Samples\SimpleSprite\SimpleSprite_WindowsMetro.csproj", "{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSprite", "Samples\SimpleSprite\SimpleSprite_WindowsMetro.csproj", "{AAA20E99-A897-4C91-A23E-D02B8F08ACA5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextRendering_WindowsMetro", "Samples\TextRendering\TextRendering_WindowsMetro.csproj", "{BC79B021-10E4-4D01-945A-7048FFF53A22}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextRendering", "Samples\TextRendering\TextRendering_WindowsMetro.csproj", "{BC79B021-10E4-4D01-945A-7048FFF53A22}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleContent", "Samples\SampleContent\SampleContent.contentproj", "{FA6E229D-4504-47B1-8A23-2D3FCC13F778}"
 EndProject
@@ -29,13 +29,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InputSystems", "InputSystem
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SoundSystems", "SoundSystems", "{5725DA44-4F5C-4E93-A957-AC5C85603EE9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.XAudio_WindowsMetro", "SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj", "{6A582788-C4D2-410C-96CD-177F75712D65}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.XAudio", "SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_WindowsMetro.csproj", "{6A582788-C4D2-410C-96CD-177F75712D65}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsGame_WindowsMetro", "Samples\WindowsGame\WindowsGame_WindowsMetro.csproj", "{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsGame", "Samples\WindowsGame\WindowsGame_WindowsMetro.csproj", "{A08575E0-7B21-4822-9D4C-6B9EEB7EFFF7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectConverter", "Tools\ProjectConverter\ProjectConverter.csproj", "{B5209A04-B2F8-4033-A5E7-545BE771214C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect_WindowsMetro", "Samples\Kinect\Kinect_WindowsMetro.csproj", "{A42413A9-5189-40CB-AACA-D50F24865431}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kinect", "Samples\Kinect\Kinect_WindowsMetro.csproj", "{A42413A9-5189-40CB-AACA-D50F24865431}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stock Shaders", "Stock Shaders", "{60824BDB-AC8A-42ED-9B79-111FB44669FF}"
 EndProject
@@ -77,11 +77,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XNA", "XNA", "{BD648BB8-EF2
 		shader\XNA\Structures.fxh = shader\XNA\Structures.fxh
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.GL3", "RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_WindowsMetro.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX11_WindowsMetro", "RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj", "{B30DE9C2-0926-46B6-8351-9AF276C472D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX11", "RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj", "{B30DE9C2-0926-46B6-8351-9AF276C472D5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{82CDEC51-2E62-4D6D-8A89-8E0F68A9722B}"
 	ProjectSection(SolutionItems) = preProject
@@ -90,24 +86,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{82CDEC51
 		build\MakeAnxFramework.cmd = build\MakeAnxFramework.cmd
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardSample_WindowsMetro", "Samples\KeyboardSample\KeyboardSample_WindowsMetro.csproj", "{05233BB1-444F-43F6-A3DF-B82AA924E094}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyboardSample", "Samples\KeyboardSample\KeyboardSample_WindowsMetro.csproj", "{05233BB1-444F-43F6-A3DF-B82AA924E094}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{04C721BB-F871-4872-9EA9-B2062BF21E62}"
 	ProjectSection(SolutionItems) = preProject
 		Installer\anx.wxs = Installer\anx.wxs
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget_WindowsMetro", "Samples\RenderTarget\RenderTarget_WindowsMetro.csproj", "{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget", "Samples\RenderTarget\RenderTarget_WindowsMetro.csproj", "{71378D2F-0DCD-4413-8DE0-3FEC0BA04E27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StencilBuffer_WindowsMetro", "Samples\StencilBuffer\StencilBuffer_WindowsMetro.csproj", "{41E6C2CF-51EA-4D8E-96AE-739CA3951766}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StencilBuffer", "Samples\StencilBuffer\StencilBuffer_WindowsMetro.csproj", "{41E6C2CF-51EA-4D8E-96AE-739CA3951766}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives_WindowsMetro", "Samples\Primitives\Primitives_WindowsMetro.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Primitives", "Samples\Primitives\Primitives_WindowsMetro.csproj", "{57097B7A-A283-4409-8AAC-35BF0F458657}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL_WindowsMetro", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_WindowsMetro.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.OpenAL", "SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_WindowsMetro.csproj", "{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording_WindowsMetro", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording_WindowsMetro.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Recording", "InputSystems\ANX.InputSystem.Recording\ANX.InputSystem.Recording_WindowsMetro.csproj", "{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.Metro_WindowsMetro", "RenderSystems\ANX.RenderSystem.Windows.Metro\ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj", "{FF0AB665-2796-4354-9630-76C2751DB3C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.Metro", "RenderSystems\ANX.RenderSystem.Windows.Metro\ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj", "{FF0AB665-2796-4354-9630-76C2751DB3C2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DX11", "DX11", "{6285F3EF-07DB-49C9-8CDE-A9092789FE4F}"
 	ProjectSection(SolutionItems) = preProject
@@ -120,39 +116,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DX11", "DX11", "{6285F3EF-0
 		shader\DX11\SpriteBatch.fx = shader\DX11\SpriteBatch.fx
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Standard_WindowsMetro", "InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_WindowsMetro.csproj", "{49066074-3B7B-4A55-B122-6BD33AB73558}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputSystem.Standard", "InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_WindowsMetro.csproj", "{49066074-3B7B-4A55-B122-6BD33AB73558}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.XInput_WindowsMetro", "InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj", "{60D08399-244F-46A3-91F1-4CFD26D961A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.XInput", "InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_WindowsMetro.csproj", "{60D08399-244F-46A3-91F1-4CFD26D961A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.OpenTK_WindowsMetro", "InputSystems\ANX.InputDevices.OpenTK\ANX.InputDevices.OpenTK_WindowsMetro.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.OpenTK", "InputSystems\ANX.InputDevices.OpenTK\ANX.InputDevices.OpenTK_WindowsMetro.csproj", "{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.Kinect_WindowsMetro", "InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.Kinect", "InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_WindowsMetro.csproj", "{E5D69E75-D77C-493F-BBDA-6F9E73B82549}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Test_WindowsMetro", "InputSystems\ANX.InputDevices.Test\ANX.InputDevices.Test_WindowsMetro.csproj", "{5040A9C7-6DEC-4613-8586-A598C4070B35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Test", "InputSystems\ANX.InputDevices.Test\ANX.InputDevices.Test_WindowsMetro.csproj", "{5040A9C7-6DEC-4613-8586-A598C4070B35}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRenderTarget_WindowsMetro", "Samples\MultiRenderTarget\MultiRenderTarget_WindowsMetro.csproj", "{9C9C6245-35C2-4230-8E17-9038A228227F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRenderTarget", "Samples\MultiRenderTarget\MultiRenderTarget_WindowsMetro.csproj", "{9C9C6245-35C2-4230-8E17-9038A228227F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlatformSystems", "PlatformSystems", "{1436F7C9-29D3-4FEF-8914-10B45F13D142}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsEditor_WindowsMetro", "Samples\WindowsFormsEditor\WindowsFormsEditor_WindowsMetro.csproj", "{441D953C-94C2-42FD-9917-3EB2F6E28173}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsEditor", "Samples\WindowsFormsEditor\WindowsFormsEditor_WindowsMetro.csproj", "{441D953C-94C2-42FD-9917-3EB2F6E28173}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfEditor_WindowsMetro", "Samples\WpfEditor\WpfEditor_WindowsMetro.csproj", "{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfEditor", "Samples\WpfEditor\WpfEditor_WindowsMetro.csproj", "{EFC485F7-3E0A-40AB-B79D-E07FE86FC386}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelSample_WindowsMetro", "Samples\ModelSample\ModelSample\ModelSample_WindowsMetro.csproj", "{ED081799-AB02-4793-96F8-F9EA7F3192E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelSample", "Samples\ModelSample\ModelSample\ModelSample_WindowsMetro.csproj", "{ED081799-AB02-4793-96F8-F9EA7F3192E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Windows_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_WindowsMetro.csproj", "{068EB2E9-963C-4E1B-8831-E25011F11FFE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Windows", "PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_WindowsMetro.csproj", "{068EB2E9-963C-4E1B-8831-E25011F11FFE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Metro_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Metro\ANX.PlatformSystem.Metro_WindowsMetro.csproj", "{04F6041E-475E-4B2A-A889-6A33EABD718B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Metro", "PlatformSystems\ANX.PlatformSystem.Metro\ANX.PlatformSystem.Metro_WindowsMetro.csproj", "{04F6041E-475E-4B2A-A889-6A33EABD718B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Linux_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.Linux\ANX.PlatformSystem.Linux_WindowsMetro.csproj", "{2B6D0EFF-7874-495F-9226-873ED9649C60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.Linux", "PlatformSystems\ANX.PlatformSystem.Linux\ANX.PlatformSystem.Linux_WindowsMetro.csproj", "{2B6D0EFF-7874-495F-9226-873ED9649C60}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordingSample_WindowsMetro", "Samples\RecordingSample\RecordingSample_WindowsMetro.csproj", "{160150D5-38E6-482D-97F5-2624F322A854}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RecordingSample", "Samples\RecordingSample\RecordingSample_WindowsMetro.csproj", "{160150D5-38E6-482D-97F5-2624F322A854}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.PsVita_WindowsMetro", "RenderSystems\ANX.RenderSystem.PsVita\ANX.RenderSystem.PsVita_WindowsMetro.csproj", "{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.PsVita", "RenderSystems\ANX.RenderSystem.PsVita\ANX.RenderSystem.PsVita_WindowsMetro.csproj", "{2B71A7C2-0D18-4E3D-AE5A-320641D1162A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.PsVita_WindowsMetro", "PlatformSystems\ANX.PlatformSystem.PsVita\ANX.PlatformSystem.PsVita_WindowsMetro.csproj", "{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.PlatformSystem.PsVita", "PlatformSystems\ANX.PlatformSystem.PsVita\ANX.PlatformSystem.PsVita_WindowsMetro.csproj", "{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Content.Pipeline_WindowsMetro", "ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline_WindowsMetro.csproj", "{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.Content.Pipeline", "ANX.Framework.Content.Pipeline\ANX.Framework.Content.Pipeline_WindowsMetro.csproj", "{2DAFDFC1-223B-4741-87BB-BE3D0A7617DB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HLSLParser", "Tools\HLSLParser\HLSLParser\HLSLParser.csproj", "{9588B0C3-E03A-4C71-89A4-2C8685D426F1}"
 EndProject
@@ -177,25 +173,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnxSampleBrowser", "Tools\A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XNBInspector", "Tools\XNBInspector\XNBInspector.csproj", "{14B39F89-C9B0-407E-877A-B515C985E96E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita_WindowsMetro", "InputSystems\ANX.InputDevices.PsVita\ANX.InputDevices.PsVita_WindowsMetro.csproj", "{566293A4-1187-4289-A28C-C74B499D46AA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita", "InputSystems\ANX.InputDevices.PsVita\ANX.InputDevices.PsVita_WindowsMetro.csproj", "{566293A4-1187-4289-A28C-C74B499D46AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita_WindowsMetro", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita_WindowsMetro.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita_WindowsMetro.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample_WindowsMetro", "Samples\AudioSample\AudioSample_WindowsMetro.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\AudioSample\AudioSample_WindowsMetro.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "SoundSystems\WaveUtils\WaveUtils_WindowsMetro.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DualTextureSample", "Samples\DualTextureSample\DualTextureSample_WindowsMetro.csproj", "{9259CC4E-AE6B-403C-8FAB-2408448C3935}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DualTextureSample_WindowsMetro", "Samples\DualTextureSample\DualTextureSample_WindowsMetro.csproj", "{9259CC4E-AE6B-403C-8FAB-2408448C3935}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicEffectSample", "Samples\BasicEffectSample\BasicEffectSample_WindowsMetro.csproj", "{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.BaseDirectX", "RenderSystems\ANX.BaseDirectX\ANX.BaseDirectX_WindowsMetro.csproj", "{A4D3AD34-E49C-4142-8620-2AFF44ED6719}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Support", "Support", "{3E29A6C6-9487-46A7-A161-D8DB84514933}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicEffectSample_WindowsMetro", "Samples\BasicEffectSample\BasicEffectSample_WindowsMetro.csproj", "{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUtils", "Support\WaveUtils\WaveUtils_WindowsMetro.csproj", "{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI_WindowsMetro", "InputSystems\ANX.InputDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj", "{628AB80A-B1B9-4878-A810-7A58D4840F60}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.GL3", "RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_WindowsMetro.csproj", "{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.ModernUI_WindowsMetro", "SoundSystems\ANX.SoundSystem.Windows.ModernUI\ANX.SoundSystem.Windows.ModernUI_WindowsMetro.csproj", "{7C764555-14B2-45E9-AB33-0C412C8AC53B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX10", "RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj", "{5BE49183-2F6F-4527-AC90-D816911FCF90}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI", "InputSystems\ANX.InputDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj", "{628AB80A-B1B9-4878-A810-7A58D4840F60}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -399,34 +397,6 @@ Global
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x64.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.ActiveCfg = Release|x86
 		{D73E5FF4-AE88-4637-8159-120FBDA564BF}.Release|x86.Build.0 = Release|x86
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x64.ActiveCfg = Release|Any CPU
-		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x64.ActiveCfg = Release|Any CPU
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|Any CPU.Build.0 = Debug|x86
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5}.Debug|ARM.ActiveCfg = Debug|x86
@@ -918,20 +888,6 @@ Global
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x64.ActiveCfg = Release|Any CPU
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x64.ActiveCfg = Release|Any CPU
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|Any CPU.Build.0 = Debug|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Debug|ARM.ActiveCfg = Debug|x86
@@ -947,20 +903,6 @@ Global
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x64.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x86.ActiveCfg = Release|x86
 		{9259CC4E-AE6B-403C-8FAB-2408448C3935}.Release|x86.Build.0 = Release|x86
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|x64.ActiveCfg = Release|Any CPU
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719}.Release|x86.ActiveCfg = Release|Any CPU
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|Any CPU.Build.0 = Debug|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Debug|ARM.ActiveCfg = Debug|x86
@@ -976,12 +918,54 @@ Global
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x64.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x86.ActiveCfg = Release|x86
 		{D810F12D-6CE9-4755-AC6A-5DFEC7D1C782}.Release|x86.Build.0 = Release|x86
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x64.ActiveCfg = Release|Any CPU
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|ARM.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BE49183-2F6F-4527-AC90-D816911FCF90}.Release|x86.ActiveCfg = Release|Any CPU
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.ActiveCfg = Debug|ARM
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|ARM.Build.0 = Debug|ARM
-		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.ActiveCfg = Debug|x64
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x64.Build.0 = Debug|x64
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Debug|x86.ActiveCfg = Debug|x86
@@ -990,32 +974,12 @@ Global
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Any CPU.Build.0 = Release|Any CPU
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.ActiveCfg = Release|ARM
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|ARM.Build.0 = Release|ARM
-		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|Mixed Platforms.Build.0 = Release|x86
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.ActiveCfg = Release|x64
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.Build.0 = Release|x64
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.ActiveCfg = Release|x86
 		{628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.Build.0 = Release|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|ARM.Build.0 = Debug|ARM
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x64.ActiveCfg = Debug|x64
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x64.Build.0 = Debug|x64
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x86.ActiveCfg = Debug|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x86.Build.0 = Debug|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|ARM.ActiveCfg = Release|ARM
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|ARM.Build.0 = Release|ARM
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x64.ActiveCfg = Release|x64
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x64.Build.0 = Release|x64
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x86.ActiveCfg = Release|x86
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1031,12 +995,11 @@ Global
 		{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
 		{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
-		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
-		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{FF0AB665-2796-4354-9630-76C2751DB3C2} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{2B71A7C2-0D18-4E3D-AE5A-320641D1162A} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
-		{A4D3AD34-E49C-4142-8620-2AFF44ED6719} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
+		{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
+		{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
 		{F945515B-394D-4ED4-80E0-98EB59B69D24} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{AAA20E99-A897-4C91-A23E-D02B8F08ACA5} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
 		{BC79B021-10E4-4D01-945A-7048FFF53A22} = {9B0DD48B-3912-4F33-AF3F-691AF02B73F9}
@@ -1066,8 +1029,6 @@ Global
 		{6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
-		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
-		{7C764555-14B2-45E9-AB33-0C412C8AC53B} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9}
 		{CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{E4FFD875-95FC-48F2-8B6D-8483D0B71666} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{BD648BB8-EF28-453C-B4F5-EE3C93EB4DAF} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
@@ -1077,6 +1038,7 @@ Global
 		{04F6041E-475E-4B2A-A889-6A33EABD718B} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2B6D0EFF-7874-495F-9226-873ED9649C60} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2CF3FE4D-586E-4B07-8BF0-1E84B670F0AD} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
+		{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C} = {3E29A6C6-9487-46A7-A161-D8DB84514933}
 	EndGlobalSection
 	GlobalSection(SubversionScc) = preSolution
 		Svn-Managed = True
diff --git a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_PSVita.csproj b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_PSVita.csproj
index 2a25ed0d..ae45b87d 100644
--- a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_PSVita.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_PSVita.csproj
@@ -42,7 +42,7 @@
     <Compile Include="LinuxGameHost.cs" />
     <Compile Include="LinuxGameTimer.cs" />
     <Compile Include="LinuxGameWindow.cs" />
-    <Compile Include="LinuxPlatformCreator.cs" />
+    <Compile Include="LinuxPlatformSystem.cs" />
     <Compile Include="LinuxStorageContainer.cs" />
     <Compile Include="LinuxStorageDevice.cs" />
     <Compile Include="LinuxTitleContainer.cs" />
diff --git a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_Linux.csproj b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_Linux.csproj
index 67ca127a..2f6199a1 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_Linux.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_Linux.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_PSVita.csproj b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_PSVita.csproj
index c34d3cc4..10c49999 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_PSVita.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_PSVita.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -41,7 +41,7 @@
     <Compile Include="MetroStorageDevice.cs" />
     <Compile Include="MetroTitleContainer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="MetroPlatformCreator.cs" />
+    <Compile Include="MetroPlatformSystem.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
     <Compile Include="WindowsGameHost.cs" />
     <Compile Include="WindowsGameWindow.cs" />
diff --git a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_PSVita.csproj b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_PSVita.csproj
index 32c360ce..fc78f1db 100644
--- a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_PSVita.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_PSVita.csproj
@@ -46,7 +46,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WindowsGameHost.cs" />
     <Compile Include="WindowsGameWindow.cs" />
-    <Compile Include="WindowsPlatformCreator.cs" />
+    <Compile Include="WindowsPlatformSystem.cs" />
     <Compile Include="WindowsStorageDevice.cs" />
     <Compile Include="WindowsTitleContainer.cs" />
   </ItemGroup>
diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
index 3ac4ec54..e17aa47c 100644
--- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
+++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
@@ -68,6 +68,12 @@
     <Compile Include="Texture2DGL3.cs" />
     <Compile Include="VertexBufferGL3.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_Linux.csproj">
+      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent></PreBuildEvent>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
index bdc97d50..c2483902 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT DX10;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT DX10;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -62,29 +62,34 @@
     <Compile Include="DepthStencilState_DX10.cs" />
     <Compile Include="EffectParameter_DX10.cs" />
     <Compile Include="EffectTechnique_DX10.cs" />
-    <Compile Include="Effect_DX10.cs" />
+    <Compile Include="GraphicsDeviceDX.cs" />
     <Compile Include="Helpers\FormatConverter.cs" />
-    <Compile Include="GraphicsDeviceWindowsDX10.cs" />
-    <Compile Include="IndexBuffer_DX10.cs" />
+    <Compile Include="DxIndexBuffer.cs" />
     <Compile Include="EffectPass_DX10.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RasterizerState_DX10.cs" />
     <Compile Include="RenderTarget2D_DX10.cs" />
     <Compile Include="SamplerState_DX10.cs" />
     <Compile Include="ShaderByteCode.cs" />
+    <Compile Include="EffectDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedEffectDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedGraphicsDeviceDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\IncludeHandler.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\WindowHelper.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\DxFormatConverter.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedDxTexture2D.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedIndexBuffer.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedVertexBuffer.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedStateObject.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
-    <Compile Include="Texture2D_DX10.cs" />
-    <Compile Include="VertexBuffer_DX10.cs" />
+    <Compile Include="DxTexture2D.cs" />
+    <Compile Include="DxVertexBuffer.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX_PSVita.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
   <PropertyGroup>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
index 4131bc3e..3b11c99c 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT DX11;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT DX11;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -42,11 +42,11 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX_PSVita.csproj">
+    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX.csproj">
       <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
       <Name>ANX.BaseDirectX</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
@@ -79,18 +79,27 @@
     <Compile Include="EffectParameter_DX11.cs" />
     <Compile Include="EffectPass_DX11.cs" />
     <Compile Include="EffectTechnique_DX11.cs" />
-    <Compile Include="Effect_DX11.cs" />
     <Compile Include="FormatConverter.cs" />
-    <Compile Include="GraphicsDeviceWindowsDX11.cs" />
-    <Compile Include="IndexBuffer_DX11.cs" />
+    <Compile Include="GraphicsDeviceDX.cs" />
+    <Compile Include="DxIndexBuffer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RasterizerState_DX11.cs" />
     <Compile Include="RenderTarget2D_DX11.cs" />
     <Compile Include="SamplerState_DX11.cs" />
     <Compile Include="ShaderByteCode.cs" />
+    <Compile Include="EffectDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedEffectDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedGraphicsDeviceDX.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\IncludeHandler.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\WindowHelper.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\DxFormatConverter.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedDxTexture2D.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedIndexBuffer.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedVertexBuffer.cs" />
+    <Compile Include="..\ANX.RenderSystem.DX.SharedSources\SharedStateObject.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
-    <Compile Include="Texture2D_DX11.cs" />
-    <Compile Include="VertexBuffer_DX11.cs" />
+    <Compile Include="DxTexture2D.cs" />
+    <Compile Include="DxVertexBuffer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
index 111d5d62..950ccb8b 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
@@ -84,11 +84,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Metro\ANX.PlatformSystem.Metro_PSVita.csproj">
-      <Project>{04F6041E-475E-4B2A-A889-6A33EABD718B}</Project>
+      <Project>{04f6041e-475e-4b2a-a889-6a33eabd718b}</Project>
       <Name>ANX.PlatformSystem.Metro</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/Samples/AudioSample/AudioSample_PSVita.csproj b/Samples/AudioSample/AudioSample_PSVita.csproj
index bf7d9d6c..ac738f55 100644
--- a/Samples/AudioSample/AudioSample_PSVita.csproj
+++ b/Samples/AudioSample/AudioSample_PSVita.csproj
@@ -92,10 +92,6 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
-      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
-      <Name>ANX.RenderSystem.Windows.DX10</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_PSVita.csproj">
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
       <Name>ANX.SoundSystem.OpenAL</Name>
diff --git a/Samples/BasicEffectSample/BasicEffectSample_PSVita.csproj b/Samples/BasicEffectSample/BasicEffectSample_PSVita.csproj
index afe9bce5..e317af41 100644
--- a/Samples/BasicEffectSample/BasicEffectSample_PSVita.csproj
+++ b/Samples/BasicEffectSample/BasicEffectSample_PSVita.csproj
@@ -115,14 +115,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
diff --git a/Samples/DualTextureSample/DualTextureSample_PSVita.csproj b/Samples/DualTextureSample/DualTextureSample_PSVita.csproj
index d195f4d8..2fad88b9 100644
--- a/Samples/DualTextureSample/DualTextureSample_PSVita.csproj
+++ b/Samples/DualTextureSample/DualTextureSample_PSVita.csproj
@@ -94,14 +94,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
@@ -110,6 +106,10 @@
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
       <Name>ANX.SoundSystem.OpenAL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
+      <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
+      <Name>ANX.SoundSystem.Windows.XAudio</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
       <Name>SampleContent</Name>
diff --git a/Samples/KeyboardSample/KeyboardSample_PSVita.csproj b/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
index e49d3057..e45e08f4 100644
--- a/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
+++ b/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
@@ -119,7 +119,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
diff --git a/Samples/Kinect/Kinect_PSVita.csproj b/Samples/Kinect/Kinect_PSVita.csproj
index f447c48c..89b6731d 100644
--- a/Samples/Kinect/Kinect_PSVita.csproj
+++ b/Samples/Kinect/Kinect_PSVita.csproj
@@ -143,10 +143,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
-      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
-      <Name>ANX.RenderSystem.Windows.DX10</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/ModelSample/ModelSample/ModelSample_Linux.csproj b/Samples/ModelSample/ModelSample/ModelSample_Linux.csproj
index 13a4de60..2f488532 100644
--- a/Samples/ModelSample/ModelSample/ModelSample_Linux.csproj
+++ b/Samples/ModelSample/ModelSample/ModelSample_Linux.csproj
@@ -140,7 +140,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3.csproj">
+    <ProjectReference Include="..\..\..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_Linux.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
       <Name>ANX.RenderSystem.GL3</Name>
     </ProjectReference>
diff --git a/Samples/ModelSample/ModelSample/ModelSample_PSVita.csproj b/Samples/ModelSample/ModelSample/ModelSample_PSVita.csproj
index 49d9c120..f6e97ab5 100644
--- a/Samples/ModelSample/ModelSample/ModelSample_PSVita.csproj
+++ b/Samples/ModelSample/ModelSample/ModelSample_PSVita.csproj
@@ -142,13 +142,17 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_PSVita.csproj">
+      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
+      <Name>ANX.RenderSystem.GL3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    <ProjectReference Include="..\..\..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
+      <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
+      <Name>ANX.RenderSystem.Windows.DX11</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SampleContent\SampleContent.contentproj">
       <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
diff --git a/Samples/MultiRenderTarget/MultiRenderTarget_PSVita.csproj b/Samples/MultiRenderTarget/MultiRenderTarget_PSVita.csproj
index 76935497..40c3460c 100644
--- a/Samples/MultiRenderTarget/MultiRenderTarget_PSVita.csproj
+++ b/Samples/MultiRenderTarget/MultiRenderTarget_PSVita.csproj
@@ -137,7 +137,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
diff --git a/Samples/Primitives/Primitives_PSVita.csproj b/Samples/Primitives/Primitives_PSVita.csproj
index 14e4b27c..82830be8 100644
--- a/Samples/Primitives/Primitives_PSVita.csproj
+++ b/Samples/Primitives/Primitives_PSVita.csproj
@@ -116,14 +116,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/RecordingSample/RecordingSample_PSVita.csproj b/Samples/RecordingSample/RecordingSample_PSVita.csproj
index c24e58da..8a30ac16 100644
--- a/Samples/RecordingSample/RecordingSample_PSVita.csproj
+++ b/Samples/RecordingSample/RecordingSample_PSVita.csproj
@@ -117,7 +117,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
diff --git a/Samples/RenderTarget/RenderTarget_PSVita.csproj b/Samples/RenderTarget/RenderTarget_PSVita.csproj
index e7fd39a0..dc4a1722 100644
--- a/Samples/RenderTarget/RenderTarget_PSVita.csproj
+++ b/Samples/RenderTarget/RenderTarget_PSVita.csproj
@@ -117,14 +117,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/SimpleSprite/SimpleSprite_PSVita.csproj b/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
index 75f7d81c..415565ee 100644
--- a/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
+++ b/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
@@ -95,14 +95,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
diff --git a/Samples/StencilBuffer/StencilBuffer_PSVita.csproj b/Samples/StencilBuffer/StencilBuffer_PSVita.csproj
index 24d39686..bc5db415 100644
--- a/Samples/StencilBuffer/StencilBuffer_PSVita.csproj
+++ b/Samples/StencilBuffer/StencilBuffer_PSVita.csproj
@@ -150,7 +150,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
diff --git a/Samples/TextRendering/TextRendering_PSVita.csproj b/Samples/TextRendering/TextRendering_PSVita.csproj
index 22e72d5c..ef30722c 100644
--- a/Samples/TextRendering/TextRendering_PSVita.csproj
+++ b/Samples/TextRendering/TextRendering_PSVita.csproj
@@ -117,14 +117,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/VertexIndexBuffer/VertexIndexBuffer_PSVita.csproj b/Samples/VertexIndexBuffer/VertexIndexBuffer_PSVita.csproj
index ebc4fef0..e2dcfb61 100644
--- a/Samples/VertexIndexBuffer/VertexIndexBuffer_PSVita.csproj
+++ b/Samples/VertexIndexBuffer/VertexIndexBuffer_PSVita.csproj
@@ -116,7 +116,7 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_PSVita.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_PSVita.csproj
index d09ed964..dbce8af9 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor_PSVita.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_PSVita.csproj
@@ -66,9 +66,9 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
+      <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_PSVita.csproj">
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
diff --git a/Samples/WindowsGame/WindowsGame_PSVita.csproj b/Samples/WindowsGame/WindowsGame_PSVita.csproj
index 0533688b..d1a35ec2 100644
--- a/Samples/WindowsGame/WindowsGame_PSVita.csproj
+++ b/Samples/WindowsGame/WindowsGame_PSVita.csproj
@@ -140,14 +140,10 @@
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX11\ANX.RenderSystem.Windows.DX11_PSVita.csproj">
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
diff --git a/Samples/WpfEditor/WpfEditor_PSVita.csproj b/Samples/WpfEditor/WpfEditor_PSVita.csproj
index ad8a242e..61034276 100644
--- a/Samples/WpfEditor/WpfEditor_PSVita.csproj
+++ b/Samples/WpfEditor/WpfEditor_PSVita.csproj
@@ -106,9 +106,9 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.Windows.GL3</Name>
+    <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
+      <Name>ANX.RenderSystem.Windows.DX10</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_PSVita.csproj">
       <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
index c165c78a..3aac1509 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
@@ -53,7 +53,7 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WaveUtils\WaveUtils_PSVita.csproj">
+    <ProjectReference Include="..\..\Support\WaveUtils\WaveUtils_PSVita.csproj">
       <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
       <Name>WaveUtils</Name>
     </ProjectReference>
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs b/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs
index 4948c077..d5c6410a 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs
@@ -20,7 +20,7 @@ namespace ANX.SoundSystem.OpenAL
 		{
 			get
 			{
-				return "Sound.OpenAL";
+				return "OpenAL";
 			}
 		}
 
diff --git a/Support/WaveUtils/WaveUtils_PSVita.csproj b/Support/WaveUtils/WaveUtils_PSVita.csproj
index 360a38ec..bd93af60 100644
--- a/Support/WaveUtils/WaveUtils_PSVita.csproj
+++ b/Support/WaveUtils/WaveUtils_PSVita.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Support/WaveUtils/WaveUtils_WindowsMetro.csproj b/Support/WaveUtils/WaveUtils_WindowsMetro.csproj
index ec5899f1..c4f2339d 100644
--- a/Support/WaveUtils/WaveUtils_WindowsMetro.csproj
+++ b/Support/WaveUtils/WaveUtils_WindowsMetro.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Tools/ProjectConverter/AssemblyInfoFixer.cs b/Tools/ProjectConverter/AssemblyInfoFixer.cs
new file mode 100644
index 00000000..675d4ad1
--- /dev/null
+++ b/Tools/ProjectConverter/AssemblyInfoFixer.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+// This file is part of the ANX.Framework created by the
+// "ANX.Framework developer group" and released under the Ms-PL license.
+// For details see: http://anxframework.codeplex.com/license
+
+namespace ProjectConverter
+{
+    public class AssemblyInfoFixer
+    {
+        public static void FixCompanyAndCopyright(string filepath, int yearOfLastChange)
+        {
+            FixAllEntries(filepath, "AssemblyCompany", "ANX.Framework Team");
+            FixAllEntries(filepath, "AssemblyCopyright", "Copyright © ANX.Framework Team 2011 - " + yearOfLastChange);
+        }
+
+        #region FixAllEntries
+        private static void FixAllEntries(string filepath, string entryName, string newValue)
+        {
+            var projectPaths = CollectProjectPaths(filepath);
+            foreach (string project in projectPaths)
+            {
+                string assemblyInfoPath = Path.Combine(Path.GetDirectoryName(project), "Properties//AssemblyInfo.cs");
+                string text = File.ReadAllText(assemblyInfoPath, Encoding.UTF8);
+                int index = text.IndexOf("[assembly: " + entryName);
+                if (index == -1)
+                    continue;
+
+                index = text.IndexOf("\"", index) + 1;
+                int endIndex = text.IndexOf("\"", index);
+                text = text.Remove(index, endIndex - index).Insert(index, newValue);
+
+                File.WriteAllText(assemblyInfoPath, text, Encoding.UTF8);
+            }
+        }
+        #endregion
+
+        #region CollectProjectPaths
+        private static List<string> CollectProjectPaths(string filepath)
+        {
+            var projectPaths = new List<string>();
+            if (filepath.EndsWith(".sln", StringComparison.InvariantCultureIgnoreCase))
+            {
+                var solution = VsSolution.Load(filepath);
+                string basePath = Path.GetDirectoryName(filepath);
+
+                foreach (var project in solution.Projects)
+                    if (project.IsCsProject)
+                        projectPaths.Add(Path.Combine(basePath, project.RelativePath));
+            }
+            else
+                projectPaths.Add(filepath);
+
+            return projectPaths;
+        }
+        #endregion
+    }
+}
diff --git a/Tools/ProjectConverter/Converter.cs b/Tools/ProjectConverter/Converter.cs
index 6cc651e5..d297db98 100644
--- a/Tools/ProjectConverter/Converter.cs
+++ b/Tools/ProjectConverter/Converter.cs
@@ -14,21 +14,12 @@ namespace ProjectConverter
 {
 	public abstract class Converter
 	{
-		protected const string XnaGameStudioTarget =
-			"Microsoft.Xna.GameStudio.targets";
+		protected const string XnaGameStudioTarget = "Microsoft.Xna.GameStudio.targets";
 		protected const string XnaPipelineExtensionTarget =
 			"Microsoft.Xna.GameStudio.ContentPipelineExtensions.targets";
 
-		protected ProjectPath CurrentProject
-		{
-			get;
-			private set;
-		}
-
-		public abstract string Postfix
-		{
-			get;
-		}
+		protected ProjectPath CurrentProject { get; private set; }
+		public abstract string Postfix { get; }
 
 		#region ConvertAllProjects
 		public void ConvertAllProjects(string solutionFilepath)
@@ -221,19 +212,14 @@ namespace ProjectConverter
 		#region CollectAllProjects
 		private ProjectPath[] CollectAllProjects(string solutionFilepath)
 		{
-			VSSolution solution = new VSSolution(solutionFilepath);
-			List<ProjectPath> result = new List<ProjectPath>();
+			var solution = VsSolution.Load(solutionFilepath);
+			var result = new List<ProjectPath>();
 
 			string basePath = Path.GetDirectoryName(solutionFilepath);
 
 			foreach (var project in solution.Projects)
-			{
-				if (project.IsCsProject &&
-					project.RelativePath.Contains("Tools") == false)
-				{
+				if (project.IsCsProject && project.RelativePath.Contains("Tools") == false)
 					result.Add(new ProjectPath(this, project.RelativePath, basePath));
-				}
-			}
 
 			return result.ToArray();
 		}
diff --git a/Tools/ProjectConverter/Manifest.appxmanifest b/Tools/ProjectConverter/Manifest.appxmanifest
deleted file mode 100644
index e3351d29..00000000
--- a/Tools/ProjectConverter/Manifest.appxmanifest
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-  <Identity Name="ProjectConverter" Publisher="CN=ANX-Team" Version="1.0.0.0" />
-  <Properties>
-    <DisplayName>ProjectConverter</DisplayName>
-    <PublisherDisplayName>ANX Developer Team</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Prerequisites>
-    <OSMinVersion>6.2.0</OSMinVersion>
-    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
-  </Prerequisites>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="WindowsGame1.Program">
-      <VisualElements DisplayName="ProjectConverter" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="ProjectConverter" ForegroundText="light" BackgroundColor="#464646">
-        <DefaultTile ShowName="allLogos" ShortName="ProjectConverter" />
-        <SplashScreen Image="Assets\SplashScreen.png" />
-      </VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs b/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
index b9a43048..5490cc9e 100644
--- a/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
+++ b/Tools/ProjectConverter/Platforms/Metro/MetroAssets.cs
@@ -31,7 +31,7 @@ namespace ProjectConverter.Platforms.Metro
 			}
 			
 			XName contentNodeName = XName.Get("Content", itemGroup.Name.NamespaceName);
-			string anxAssetsPath = "../media/MetroDefaultAssets";
+			const string anxAssetsPath = "../../media/MetroDefaultAssets";
 			foreach (string assetFilepath in Directory.GetFiles(anxAssetsPath))
 			{
 				string filename = Path.GetFileName(assetFilepath);
diff --git a/Tools/ProjectConverter/Program.cs b/Tools/ProjectConverter/Program.cs
index 95ca4b59..076cf1ff 100644
--- a/Tools/ProjectConverter/Program.cs
+++ b/Tools/ProjectConverter/Program.cs
@@ -14,11 +14,11 @@ namespace ProjectConverter
 {
 	static class Program
 	{
-		private static Converter[] converters = new Converter[]
+		private static readonly Converter[] Converters = new Converter[]
 		{
 			new LinuxConverter(),
 			new MetroConverter(),
-			new PsVitaConverter(),
+			new PsVitaConverter()
 		};
 
 		[STAThread]
@@ -29,11 +29,11 @@ namespace ProjectConverter
             //   ProjectConverter /linux /psvita /windowsmetro ../../ANX.Framework.sln
 			//
 			// For testing only
-			//args = new string[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" };
+            //args = new[] { "/linux", "/psvita", "/windowsmetro", "../../ANX.Framework.sln" };
 
-            List<string> switches = new List<string>();
-            Dictionary<string, string> keyValueParameters = new Dictionary<string,string>();
-            List<string> files = new List<string>();
+            var switches = new List<string>();
+            var keyValueParameters = new Dictionary<string,string>();
+            var files = new List<string>();
 
 			foreach (string arg in args)
 			{
@@ -54,7 +54,7 @@ namespace ProjectConverter
             foreach (string file in files)
             {
                 string fileExt = Path.GetExtension(file).ToLowerInvariant();
-                foreach (Converter converter in converters)
+                foreach (Converter converter in Converters)
                 {
                     if (switches.Contains(converter.Postfix.ToLowerInvariant()))
                     {
diff --git a/Tools/ProjectConverter/ProjectConverter.csproj b/Tools/ProjectConverter/ProjectConverter.csproj
index 96265178..96354e6a 100644
--- a/Tools/ProjectConverter/ProjectConverter.csproj
+++ b/Tools/ProjectConverter/ProjectConverter.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,6 +45,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfoFixer.cs" />
     <Compile Include="Converter.cs" />
     <Compile Include="DefinesConverter.cs" />
     <Compile Include="Platforms\LinuxConverter.cs" />
@@ -56,8 +57,8 @@
     <Compile Include="ProjectData.cs" />
     <Compile Include="ProjectPath.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="VSSolution.cs" />
-    <Compile Include="VSSolutionProject.cs" />
+    <Compile Include="VsSolution.cs" />
+    <Compile Include="VsSolutionProject.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/Tools/ProjectConverter/VSSolution.cs b/Tools/ProjectConverter/VSSolution.cs
index 7b52f774..ca4159d2 100644
--- a/Tools/ProjectConverter/VSSolution.cs
+++ b/Tools/ProjectConverter/VSSolution.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-using NUnit.Framework;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -10,89 +7,65 @@ using NUnit.Framework;
 
 namespace ProjectConverter
 {
-	public class VSSolution
+	public class VsSolution
 	{
-		//internal class SolutionParser
-		//Name: Microsoft.Build.Construction.SolutionParser
-		//Assembly: Microsoft.Build, Version=4.0.0.0
+        private List<VsSolutionProject> allProjects;
 
-		public const BindingFlags NonPublicInstanceFlag =
-			BindingFlags.NonPublic | BindingFlags.Instance;
+        public VsSolutionProject[] Projects
+        {
+            get { return allProjects.ToArray(); }
+        }
 
-		private static Type solutionParserType;
-		private static PropertyInfo readerProperty;
-		private static MethodInfo parseSolutionMethod;
-		private static PropertyInfo projectsProperty;
+        private VsSolution(string filepath)
+        {
+            allProjects = new List<VsSolutionProject>();
+            ParseFile(File.ReadAllLines(filepath));
+        }
 
-		public List<VSSolutionProject> Projects
-		{
-			get;
-			private set;
-		}
+        private void ParseFile(string[] lines)
+        {
+            foreach (string currentLine in lines)
+            {
+                string line = currentLine;
+                // Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
+                if (line.TrimStart().StartsWith("Project("))
+                {
+                    int typeGuidStart = line.IndexOf('{');
+                    int typeGuidEnd = line.IndexOf('}', typeGuidStart + 1);
+                    string typeGuid = line.Substring(typeGuidStart + 1, typeGuidEnd - typeGuidStart - 1);
+                    line = line.Remove(0, typeGuidEnd + 2);
 
-		static VSSolution()
-		{
-			solutionParserType = Type.GetType(
-				"Microsoft.Build.Construction.SolutionParser, " +
-				"Microsoft.Build, Version=4.0.0.0, Culture=neutral, " +
-				"PublicKeyToken=b03f5f7f11d50a3a", false, false);
-			if (solutionParserType != null)
-			{
-				readerProperty = solutionParserType.GetProperty(
-					"SolutionReader", NonPublicInstanceFlag);
-				projectsProperty = solutionParserType.GetProperty(
-					"Projects", NonPublicInstanceFlag);
-				parseSolutionMethod = solutionParserType.GetMethod(
-					"ParseSolution", NonPublicInstanceFlag);
-			}
-		}
+                    int nameStart = line.IndexOf('"');
+                    int nameEnd = line.IndexOf('"', nameStart + 1);
+                    string name = line.Substring(nameStart + 1, nameEnd - nameStart - 1);
+                    line = line.Remove(0, nameEnd + 2);
 
-		public VSSolution(string solutionFileName)
-		{
-			if (solutionParserType == null)
-			{
-				throw new InvalidOperationException(
-					"Can not find type 'Microsoft.Build.Construction.SolutionParser' " +
-					"are you missing a assembly reference to 'Microsoft.Build.dll'?");
-			}
+                    int pathStart = line.IndexOf('"');
+                    int pathEnd = line.IndexOf('"', pathStart + 1);
+                    string relativePath = line.Substring(pathStart + 1, pathEnd - pathStart - 1);
+                    line = line.Remove(0, pathEnd);
 
-			var constructors = solutionParserType.GetConstructors(NonPublicInstanceFlag);
-			var solutionParser = constructors[0].Invoke(null);
+                    int guidStart = line.IndexOf('{');
+                    int guidEnd = line.IndexOf('}', guidStart + 1);
+                    string guid = line.Substring(guidStart + 1, guidEnd - guidStart - 1);
 
-			using (var streamReader = new StreamReader(solutionFileName))
-			{
-				readerProperty.SetValue(solutionParser, streamReader, null);
-				parseSolutionMethod.Invoke(solutionParser, null);
-			}
-			var projects = new List<VSSolutionProject>();
-			var array = (Array)projectsProperty.GetValue(solutionParser, null);
-			for (int i = 0; i < array.Length; i++)
-			{
-				projects.Add(new VSSolutionProject(array.GetValue(i)));
-			}
-			this.Projects = projects;
-		}
+                    if (relativePath.ToLower().Contains(".csproj"))
+                    {
+                        allProjects.Add(new VsSolutionProject
+                                        {
+                                            TypeGuid = typeGuid,
+                                            ProjectName = name,
+                                            RelativePath = relativePath,
+                                            ProjectGuid = guid
+                                        });
+                    }
+                }
+            }
+        }
 
-		private class VSSolutionTests
-		{
-			[Test]
-			public static void TestSolutionParser()
-			{
-				const string filepath = @"D:\code\csharp\ANX.Framework\ANX.Framework.sln";
-				VSSolution solution = new VSSolution(filepath);
-
-				Assert.Greater(solution.Projects.Count, 0);
-			}
-
-			[Test]
-			public static void TestParserNotFound()
-			{
-				Assert.Throws(typeof(InvalidOperationException), delegate
-				{
-					VSSolution.solutionParserType = null;
-					new VSSolution("");
-				});
-			}
-		}
+	    public static VsSolution Load(string filepath)
+        {
+            return new VsSolution(filepath);
+        }
 	}
 }
diff --git a/Tools/ProjectConverter/VSSolutionProject.cs b/Tools/ProjectConverter/VSSolutionProject.cs
index a735e434..fa58fc69 100644
--- a/Tools/ProjectConverter/VSSolutionProject.cs
+++ b/Tools/ProjectConverter/VSSolutionProject.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -7,62 +6,16 @@ using System.Reflection;
 
 namespace ProjectConverter
 {
-	public class VSSolutionProject
-	{
-		private static readonly Type msBuildProjectType;
-		private static readonly PropertyInfo nameProperty;
-		private static readonly PropertyInfo relativePathProperty;
-		private static readonly PropertyInfo projectGuidProperty;
+	public class VsSolutionProject
+    {
+        public string ProjectName { get; set; }
+        public string RelativePath { get; set; }
+        public string ProjectGuid { get; set; }
+        public string TypeGuid { get; set; }
 
-		public string ProjectName
-		{
-			get;
-			private set;
-		}
-
-		public string RelativePath
-		{
-			get;
-			private set;
-		}
-
-		public string ProjectGuid
-		{
-			get;
-			private set;
-		}
-
-		public bool IsCsProject
-		{
-			get
-			{
-				return RelativePath.EndsWith(".csproj");
-			}
-		}
-
-		static VSSolutionProject()
-		{
-			msBuildProjectType = Type.GetType(
-				"Microsoft.Build.Construction.ProjectInSolution, " +
-				"Microsoft.Build, Version=4.0.0.0, Culture=neutral, " +
-				"PublicKeyToken=b03f5f7f11d50a3a", false, false);
-
-			if (msBuildProjectType != null)
-			{
-				nameProperty = msBuildProjectType.GetProperty(
-					"ProjectName", VSSolution.NonPublicInstanceFlag);
-				relativePathProperty = msBuildProjectType.GetProperty(
-					"RelativePath", VSSolution.NonPublicInstanceFlag);
-				projectGuidProperty = msBuildProjectType.GetProperty(
-					"ProjectGuid", VSSolution.NonPublicInstanceFlag);
-			}
-		}
-
-		public VSSolutionProject(object solutionProject)
-		{
-			ProjectName = nameProperty.GetValue(solutionProject, null) as string;
-			RelativePath = relativePathProperty.GetValue(solutionProject, null) as string;
-			ProjectGuid = projectGuidProperty.GetValue(solutionProject, null) as string;
-		}
+	    public bool IsCsProject
+	    {
+	        get { return RelativePath.EndsWith(".csproj", StringComparison.InvariantCultureIgnoreCase); }
+	    }
 	}
 }