From 81bcc220329f38a0c2a6798c6d433ac56140db07 Mon Sep 17 00:00:00 2001
From: Glatzemann <glatzemann@users.noreply.github.com>
Date: Tue, 18 Sep 2012 13:27:37 +0000
Subject: [PATCH] - fixed a lot of issues in build script: most of metro
 building on Windows 8 is now working - fixed PlatformSystem.Metro (untested)
 - fixed project files of ANX.InputDevices.Windows.ModernUI - fixed a small
 issue in ANX.Framework's generic PlatformSystem implementation

---
 ANX.Framework.sln                             | 233 +++++++++++++++++-
 ANX.Framework/ANX.Framework_Linux.csproj      |   4 +-
 .../ANX.Framework_WindowsMetro.csproj         |   4 +-
 .../NonXNA/PlatformSystem/PlatformSystem.cs   |   7 +
 .../ANX.InpuDevices.Windows.ModernUI.csproj   | 123 ---------
 ....InpuDevices.Windows.ModernUI_Linux.csproj | 122 ---------
 ...InpuDevices.Windows.ModernUI_PSVita.csproj | 123 ---------
 ...vices.Windows.ModernUI_WindowsMetro.csproj | 128 ----------
 .../ANX.InputDevices.Windows.ModernUI.csproj  |  65 +++++
 ...vices.Windows.ModernUI_WindowsMetro.csproj |  71 ++++++
 .../Creator.cs                                |   3 +
 .../Properties/AssemblyInfo.cs                |   9 +-
 ...X.PlatformSystem.Linux_WindowsMetro.csproj |   2 +-
 .../ANX.PlatformSystem.Metro.csproj           |   2 +-
 ...X.PlatformSystem.Metro_WindowsMetro.csproj |   2 +-
 ...tformCreator.cs => MetroPlatformSystem.cs} |  40 +--
 ...PlatformSystem.Windows_WindowsMetro.csproj |   2 +-
 .../ANX.RenderSystem.GL3_WindowsMetro.csproj  |  95 +++++++
 ...derSystem.Windows.DX10_WindowsMetro.csproj |  27 +-
 ...derSystem.Windows.DX11_WindowsMetro.csproj |  25 +-
 .../ANX.RenderSystem.Windows.Metro.csproj     |   4 +-
 ...erSystem.Windows.Metro_WindowsMetro.csproj |   4 +-
 .../SwapChainMetro.cs                         |   7 +-
 .../WindowsFormsEditor_WindowsMetro.csproj    |   4 +-
 .../WindowsGame_WindowsMetro.csproj           |   4 +-
 ...ANX.SoundSystem.OpenAL_WindowsMetro.csproj |   2 +-
 build/ANX.Framework.build                     |  37 ++-
 27 files changed, 568 insertions(+), 581 deletions(-)
 delete mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI.csproj
 delete mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_Linux.csproj
 delete mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_PSVita.csproj
 delete mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_WindowsMetro.csproj
 create mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI.csproj
 create mode 100644 InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj
 rename PlatformSystems/ANX.PlatformSystem.Metro/{MetroPlatformCreator.cs => MetroPlatformSystem.cs} (70%)
 create mode 100644 RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj

diff --git a/ANX.Framework.sln b/ANX.Framework.sln
index 4ea4b447..e15341b1 100644
--- a/ANX.Framework.sln
+++ b/ANX.Framework.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework", "ANX.Framework\ANX.Framework.csproj", "{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.Framework.TestCenter", "ANX.Framework.TestCenter\ANX.Framework.TestCenter.csproj", "{7344BBEB-A1C7-43A8-B68E-D42B81973DA9}"
@@ -193,559 +193,787 @@ 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.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.csproj", "{F5819204-4882-4F33-B973-DE6762C9682F}"
+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
 		{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
 		{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
 		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -791,6 +1019,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}
 		{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/ANX.Framework_Linux.csproj b/ANX.Framework/ANX.Framework_Linux.csproj
index 4f5c2d60..d722cdfd 100644
--- a/ANX.Framework/ANX.Framework_Linux.csproj
+++ b/ANX.Framework/ANX.Framework_Linux.csproj
@@ -439,6 +439,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" />
@@ -449,7 +451,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/ANX.Framework_WindowsMetro.csproj b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
index dc38d73c..04380fd4 100644
--- a/ANX.Framework/ANX.Framework_WindowsMetro.csproj
+++ b/ANX.Framework/ANX.Framework_WindowsMetro.csproj
@@ -442,6 +442,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" />
@@ -452,7 +454,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/NonXNA/PlatformSystem/PlatformSystem.cs b/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
index 92205e6a..7a5b27fd 100644
--- a/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
+++ b/ANX.Framework/NonXNA/PlatformSystem/PlatformSystem.cs
@@ -44,9 +44,16 @@ namespace ANX.Framework.NonXNA.PlatformSystem
                 return null;
             }
 
+#if !WINDOWSMETRO
             Assembly assembly = Assembly.LoadFrom(platformAssemblyName);
 
             foreach (Type type in assembly.GetExportedTypes())
+#else
+            AssemblyName assemblyName = new AssemblyName(platformAssemblyName);
+            Assembly assembly = Assembly.Load(assemblyName);
+
+            foreach (Type type in assembly.ExportedTypes)
+#endif
             {
                 if (TypeHelper.IsTypeAssignableFrom(typeof(IPlatformSystem), type))
                 {
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI.csproj
deleted file mode 100644
index b99ea661..00000000
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.InpuDevices.Windows.ModernUI</RootNamespace>
-    <AssemblyName>ANX.InpuDevices.Windows.ModernUI</AssemblyName>
-    <DefaultLanguage>de-DE</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
-      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
-      <Name>ANX.Framework_WindowsMetro</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_Linux.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_Linux.csproj
deleted file mode 100644
index 03caf40a..00000000
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_Linux.csproj
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.InpuDevices.Windows.ModernUI</RootNamespace>
-    <AssemblyName>ANX.InpuDevices.Windows.ModernUI</AssemblyName>
-    <DefaultLanguage>de-DE</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;LINUX;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;LINUX;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;LINUX;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;LINUX;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;LINUX;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;LINUX;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;LINUX;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;LINUX;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
-      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
-      <Name>ANX.Framework_WindowsMetro</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_PSVita.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_PSVita.csproj
deleted file mode 100644
index 7a2f5c46..00000000
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_PSVita.csproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.InpuDevices.Windows.ModernUI</RootNamespace>
-    <AssemblyName>ANX.InpuDevices.Windows.ModernUI</AssemblyName>
-    <DefaultLanguage>de-DE</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;PSVITA;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;PSVITA;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;PSVITA;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;PSVITA;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;PSVITA;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;PSVITA;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
-      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
-      <Name>ANX.Framework_WindowsMetro</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_WindowsMetro.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_WindowsMetro.csproj
deleted file mode 100644
index 067be321..00000000
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InpuDevices.Windows.ModernUI_WindowsMetro.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.InpuDevices.Windows.ModernUI</RootNamespace>
-    <AssemblyName>ANX.InpuDevices.Windows.ModernUI</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;WINDOWSMETRO;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;WINDOWSMETRO;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;WINDOWSMETRO;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>NETFX_CORE;TRACE;WINDOWSMETRO;</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
-      <Project>{6899f0c9-70b9-4eb0-9dd3-e598d4be3e35}</Project>
-      <Name>ANX.Framework_WindowsMetro</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI.csproj
new file mode 100644
index 00000000..8ce018ea
--- /dev/null
+++ b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI.csproj
@@ -0,0 +1,65 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ANX.InputDevices.Windows.XInput</RootNamespace>
+    <AssemblyName>ANX.InputDevices.Windows.XInput</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;XNAEXT</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="SharpDX">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DirectInput">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.DirectInput.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.XInput.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Creator.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets. 
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj
new file mode 100644
index 00000000..0e273877
--- /dev/null
+++ b/InputSystems/ANX.InpuDevices.Windows.ModernUI/ANX.InputDevices.Windows.ModernUI_WindowsMetro.csproj
@@ -0,0 +1,71 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F5819204-4882-4F33-B973-DE6762C9682F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ANX.InputDevices.Windows.XInput</RootNamespace>
+    <AssemblyName>ANX.InputDevices.Windows.XInput</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="SharpDX">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.DirectInput">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.DirectInput.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpDX.XInput">
+      <HintPath>..\..\lib\SharpDX\Bin\Standard-net20\SharpDX.XInput.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Creator.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</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. 
+       Other similar extension points exist, see Microsoft.Common.targets. 
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
+    <VisualStudioVersion>11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+</Project>
\ No newline at end of file
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/Creator.cs b/InputSystems/ANX.InpuDevices.Windows.ModernUI/Creator.cs
index 5602f24f..fbc27441 100644
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/Creator.cs
+++ b/InputSystems/ANX.InpuDevices.Windows.ModernUI/Creator.cs
@@ -1,4 +1,5 @@
 using ANX.Framework.NonXNA;
+
 // 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
@@ -32,10 +33,12 @@ namespace ANX.InpuDevices.Windows.ModernUI
             get { throw new System.NotImplementedException(); }
         }
 
+#if XNAEXT
         public IMotionSensingDevice MotionSensingDevice
         {
             get { throw new System.NotImplementedException(); }
         }
+#endif
 
         public string Name
         {
diff --git a/InputSystems/ANX.InpuDevices.Windows.ModernUI/Properties/AssemblyInfo.cs b/InputSystems/ANX.InpuDevices.Windows.ModernUI/Properties/AssemblyInfo.cs
index 9621faa1..63d913fe 100644
--- a/InputSystems/ANX.InpuDevices.Windows.ModernUI/Properties/AssemblyInfo.cs
+++ b/InputSystems/ANX.InpuDevices.Windows.ModernUI/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // Allgemeine Informationen über eine Assembly werden über die folgenden 
 // Attribute gesteuert. Diese Attributwerte ändern, um die Informationen zu ändern,
 // die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("ANX.InpuDevices.Windows.ModernUI")]
+[assembly: AssemblyTitle("ANX.InputDevices.Windows.ModernUI")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ANX.Framework Team")]
-[assembly: AssemblyProduct("ANX.InpuDevices.Windows.ModernUI")]
+[assembly: AssemblyProduct("ANX.InputDevices.Windows.ModernUI")]
 [assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -24,6 +24,7 @@ using System.Runtime.InteropServices;
 // Es können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // mithilfe von '*' wie unten dargestellt übernommen werden:
 // [Assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.3.0")]
+[assembly: AssemblyVersion("0.0.3.*")]
 [assembly: AssemblyFileVersion("0.0.3.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
+[assembly: ComVisible(false)]
+[assembly: GuidAttribute("703E0B3E-F09D-4DE8-A8D3-D3AB507DFB28")]
diff --git a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj
index fac332a4..80c43bd7 100644
--- a/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Linux/ANX.PlatformSystem.Linux_WindowsMetro.csproj
@@ -43,7 +43,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.csproj b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro.csproj
index 3591e6bf..2da4dda4 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro.csproj
@@ -40,7 +40,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.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj
index 6c07d1e2..6e9fc559 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/ANX.PlatformSystem.Metro_WindowsMetro.csproj
@@ -42,7 +42,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.Metro/MetroPlatformCreator.cs b/PlatformSystems/ANX.PlatformSystem.Metro/MetroPlatformSystem.cs
similarity index 70%
rename from PlatformSystems/ANX.PlatformSystem.Metro/MetroPlatformCreator.cs
rename to PlatformSystems/ANX.PlatformSystem.Metro/MetroPlatformSystem.cs
index 41fc6d36..6e6859a8 100644
--- a/PlatformSystems/ANX.PlatformSystem.Metro/MetroPlatformCreator.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Metro/MetroPlatformSystem.cs
@@ -13,45 +13,10 @@ using System.Collections.Generic;
 
 namespace ANX.PlatformSystem.Metro
 {
-	public class MetroPlatformCreator : IPlatformSystemCreator
+	public class MetroPlatformSystem : IPlatformSystem
 	{
-		#region Public
-		public string Name
-		{
-			get
-			{
-				return "Platform.Metro";
-			}
-		}
-
-		public int Priority
-		{
-			get
-			{
-				return 100;
-			}
-		}
-
-		public bool IsSupported
-		{
-			get
-			{
-				return OSInformation.IsWindows;
-			}
-		}
-		#endregion
-
-		#region RegisterCreator
-		public void RegisterCreator(AddInSystemFactory factory)
-		{
-			Logger.Info(
-				"adding Metro PlatformSystem creator to collection of AddInSystemFactory");
-			factory.AddCreator(this);
-		}
-		#endregion
-
 		#region Constructor
-		public MetroPlatformCreator()
+		public MetroPlatformSystem()
 		{
 		}
 		#endregion
@@ -60,7 +25,6 @@ namespace ANX.PlatformSystem.Metro
 		public GameHost CreateGameHost(Game game)
 		{
 			Logger.Info("creating Windows GameHost");
-			AddInSystemFactory.Instance.PreventSystemChange(AddInType.PlatformSystem);
 			return new WindowsGameHost(game);
 		}
 		#endregion
diff --git a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj
index c977250f..dd6e58b8 100644
--- a/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj
+++ b/PlatformSystems/ANX.PlatformSystem.Windows/ANX.PlatformSystem.Windows_WindowsMetro.csproj
@@ -47,7 +47,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_WindowsMetro.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj
new file mode 100644
index 00000000..73f6fc8d
--- /dev/null
+++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj
@@ -0,0 +1,95 @@
+<?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>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ANX.RenderSystem.GL3</RootNamespace>
+    <AssemblyName>ANX.RenderSystem.GL3</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\bin\Debug\</OutputPath>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release\</OutputPath>
+    <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="OpenTK">
+      <HintPath>..\..\lib\OpenTK\OpenTK.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BlendStateGL3.cs" />
+    <Compile Include="Creator.cs" />
+    <Compile Include="Helpers\DatatypesMapping.cs" />
+    <Compile Include="DepthStencilStateGL3.cs" />
+    <Compile Include="EffectGL3.cs" />
+    <Compile Include="EffectParameterGL3.cs" />
+    <Compile Include="EffectPassGL3.cs" />
+    <Compile Include="EffectTechniqueGL3.cs" />
+    <Compile Include="ErrorHelper.cs" />
+    <Compile Include="GraphicsDeviceWindowsGL3.cs" />
+    <Compile Include="Helpers\GraphicsResourceManager.cs" />
+    <Compile Include="Helpers\LinuxInterop.cs" />
+    <Compile Include="Helpers\WindowsInterop.cs" />
+    <Compile Include="IndexBufferGL3.cs" />
+    <Compile Include="OcclusionQueryGL3.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RasterizerStateGL3.cs" />
+    <Compile Include="RenderTarget2DGL3.cs" />
+    <Compile Include="SamplerStateGL3.cs" />
+    <Compile Include="ShaderAttributeGL3.cs" />
+    <Compile Include="ShaderByteCode.cs" />
+    <Compile Include="ShaderData.cs" />
+    <Compile Include="ShaderHelper.cs" />
+    <Compile Include="SupportedPlatformsImpl.cs" />
+    <Compile Include="Texture2DGL3.cs" />
+    <Compile Include="VertexBufferGL3.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent></PreBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
+    <VisualStudioVersion>11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+</Project>
\ No newline at end of file
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj
index 3abacc48..3e9d3aa2 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_WindowsMetro.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT DX10;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT DX10;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -63,29 +63,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_WindowsMetro.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\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" />
   <PropertyGroup>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj
index ce83c553..1934d4c0 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_WindowsMetro.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT DX11;DEBUG;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT;TRACE;WINDOWSMETRO;</DefineConstants>
+    <DefineConstants>XNAEXT DX11;TRACE;WINDOWSMETRO;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -44,7 +44,7 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX_WindowsMetro.csproj">
+    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX.csproj">
       <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
       <Name>ANX.BaseDirectX</Name>
     </ProjectReference>
@@ -76,18 +76,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)\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/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj
index 64e76fb3..574ee766 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro.csproj
@@ -82,11 +82,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework.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.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/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj
index 325b5f8d..9d82e239 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_WindowsMetro.csproj
@@ -84,11 +84,11 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.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_WindowsMetro.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/RenderSystems/ANX.RenderSystem.Windows.Metro/SwapChainMetro.cs b/RenderSystems/ANX.RenderSystem.Windows.Metro/SwapChainMetro.cs
index ec1971b3..3b4fc4d6 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/SwapChainMetro.cs
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/SwapChainMetro.cs
@@ -1,14 +1,16 @@
 using System;
-using ANX.PlatformSystem.Metro;
 using SharpDX;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
-using PresentationParameters = ANX.Framework.Graphics.PresentationParameters;
+using ANX.Framework.NonXNA.PlatformSystem;
+using ANX.PlatformSystem.Metro;
 
 // 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
 
+using PresentationParameters = ANX.Framework.Graphics.PresentationParameters;
+
 namespace ANX.RenderSystem.Windows.Metro
 {
 	internal class SwapChainMetro : IDisposable
@@ -70,6 +72,7 @@ namespace ANX.RenderSystem.Windows.Metro
 				var dxgiAdapter = dxgiDevice2.Adapter;
 				var dxgiFactory2 = dxgiAdapter.GetParent<Factory2>();
 
+                //TODO: try to remove the direct dependency to the platform system
 				WindowsGameWindow gameWindow = (WindowsGameHost.Instance.Window as WindowsGameWindow);
 				var comWindow = new ComObject(gameWindow.Form);
 
diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
index b2cf9dbd..5f1bbcfd 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor_WindowsMetro.csproj
@@ -40,9 +40,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="Form1.cs" />
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
diff --git a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
index c46c0211..819f8e2f 100644
--- a/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
+++ b/Samples/WindowsGame/WindowsGame_WindowsMetro.csproj
@@ -67,9 +67,7 @@
     <Reference Include="System.Net" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddInSelector.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="AddInSelector.cs" />
     <Compile Include="AddInSelector.Designer.cs">
       <DependentUpon>AddInSelector.cs</DependentUpon>
     </Compile>
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
index 2f81c1b4..7fcf39d0 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_WindowsMetro.csproj
@@ -54,7 +54,7 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\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/build/ANX.Framework.build b/build/ANX.Framework.build
index c14905f6..a9d37b5b 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -74,7 +74,10 @@
   <target name="metro">
     <property name="project.anx.metro" value="true" />
     <property name="project.anx.platform" value="Windows 8 / Metro" />
+    <property name="build.platform" value="x86" />
 
+    <property name="project.anx.directives" value="${project.anx.directives} WINDOWSMETRO" />
+    
     <call target="generate_project_files" />
   </target>
   
@@ -268,8 +271,7 @@
 
     <if test="${project.anx.metro}">
       <fileset id="inputsystem_files" basedir="../InputSystems/">
-        <include name="**/*_WindowsMetro.csproj" />
-        <include name="**/*ModernUI*.csproj" />
+        <include name="**/*ModernUI*_WindowsMetro.csproj" />
         <exclude name="**/*PsVita*.csproj" />
         <exclude name="**/*Kinect*.csproj" />
         <exclude name="**/*Linux*.csproj" />
@@ -484,6 +486,32 @@
 
   </target>
 
+  <target name="build_tools" description="Tools supporting the build process of ANX.Framework" unless="${target::has-executed('build_tools')}">
+    <foreach item="File" property="projectFile">
+      <in>
+        <items basedir="../Tools/">
+          <include name="**/ProjectConverter.csproj" />
+        </items>
+      </in>
+      <do>
+        <echo message="building: ${path::get-file-name-without-extension(projectFile)}" />
+
+        <exec program="msbuild.exe" >
+          <arg value="/t:Build"/>
+          <arg value="/p:Configuration=${build.configuration}"/>
+          <arg value='/p:Platform="${build.platform}"'/>
+          <arg value="/p:OutputPath=${build.dir}/${build.configuration}" />
+          <arg value="/p:AllowUnsafeBlocks=true" />
+          <arg value="/p:SolutionDir=${build.solution_dir}" />
+          <arg value='/p:DefineConstants="${project.anx.directives}"' />
+          <arg value="/clp:ErrorsOnly" />
+          <arg value="/nologo" />
+          <arg value="${projectFile}" />
+        </exec>
+      </do>
+    </foreach>
+  </target>
+  
   <!--
     TODO: "depends rendersystem" in the tools target leads to three compilations of all the rendersystems. Currently this is necessary because we have
     kind of ring dependency. To build a rendersystem we need the StockShaderCodeGenerator. This is used to embed the stock shaders into the 
@@ -508,6 +536,7 @@
           <include name="**/*.csproj" />
           <exclude name="**/HLSLParser*.csproj" />
           <exclude name="**/DX11MetroShaderGenerator.csproj" />
+          <exclude name="**/ProjectConverter.csproj" />
         </items>
       </in>
       <do>
@@ -603,7 +632,7 @@
 
   </target>
 
-  <target name="generate_project_files" depends="tools">
+  <target name="generate_project_files" depends="build_tools">
     <fileset id="project_files" basedir="../">
       <include name="**/${project.anx.name}/*.csproj" />
       <include name="RenderSystems/**/*.csproj" />
@@ -614,6 +643,8 @@
       <exclude name="**/*_Linux.csproj" />
       <exclude name="**/*_PSVita.csproj" />
       <exclude name="**/*_WindowsMetro.csproj" />
+
+      <exclude name="Samples/**/*.csproj" if="${project.anx.metro}" />
     </fileset>
 
     <foreach item="File" property="projectFile">