diff --git a/ANX.Framework/ANX.Framework_Linux.csproj b/ANX.Framework/ANX.Framework_Linux.csproj
index bc9cc367..8961406a 100644
--- a/ANX.Framework/ANX.Framework_Linux.csproj
+++ b/ANX.Framework/ANX.Framework_Linux.csproj
@@ -98,6 +98,7 @@
     <Compile Include="Content\MathTypeReaders\RectangleReader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector2Reader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector3Reader.cs" />
+    <Compile Include="Content\MediaTypeReaders\SoundEffectReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\BooleanReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\ByteReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\CharReader.cs" />
@@ -211,6 +212,7 @@
     <Compile Include="GameWindow.cs" />
     <Compile Include="GraphicsDeviceInformation.cs" />
     <Compile Include="Graphics\BasicEffect.cs" />
+    <Compile Include="Graphics\ConstantBuffer.cs" />
     <Compile Include="Graphics\DeviceLostException.cs" />
     <Compile Include="Graphics\DisplayMode.cs" />
     <Compile Include="Graphics\DisplayModeCollection.cs" />
@@ -412,8 +414,10 @@
     <Compile Include="NonXNA\AddInLoadingException.cs" />
     <Compile Include="NonXNA\AddInTypeCollection.cs" />
     <Compile Include="NonXNA\AddInType.cs" />
+    <Compile Include="NonXNA\Development\DeveloperAttribute.cs" />
     <Compile Include="NonXNA\Development\TestStateAttribute.cs" />
     <Compile Include="NonXNA\Development\PercentageCompleteAttribute.cs" />
+    <Compile Include="NonXNA\EffectSourceLanguage.cs" />
     <Compile Include="NonXNA\InputDeviceFactory.cs" />
     <Compile Include="NonXNA\InputSystem\IGamePadCreator.cs" />
     <Compile Include="NonXNA\InputSystem\IKeyboard.cs" />
@@ -436,6 +440,7 @@
     <Compile Include="NonXNA\PlatformSystem\INativeContentManager.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeMediaLibrary.cs" />
     <Compile Include="NonXNA\Reflection\AssemblyLoader.cs" />
+    <Compile Include="NonXNA\RenderSystem\INativeConstantBuffer.cs" />
     <Compile Include="NonXNA\SoundSystem\IMicrophone.cs" />
     <Compile Include="NonXNA\Windows8\AssetsHelper.cs" />
     <Compile Include="NonXNA\Windows8\IServiceProvider.cs" />
@@ -499,9 +504,7 @@
     <Compile Include="Vector3.cs" />
     <Compile Include="Vector4.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\MediaTypeReaders\" />
-  </ItemGroup>
+  <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.
diff --git a/ANX.Framework/ANX.Framework_PSVita.csproj b/ANX.Framework/ANX.Framework_PSVita.csproj
index dcdb5e55..2d4fb8d6 100644
--- a/ANX.Framework/ANX.Framework_PSVita.csproj
+++ b/ANX.Framework/ANX.Framework_PSVita.csproj
@@ -100,6 +100,7 @@
     <Compile Include="Content\MathTypeReaders\RectangleReader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector2Reader.cs" />
     <Compile Include="Content\MathTypeReaders\Vector3Reader.cs" />
+    <Compile Include="Content\MediaTypeReaders\SoundEffectReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\BooleanReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\ByteReader.cs" />
     <Compile Include="Content\PrimitiveTypeReaders\CharReader.cs" />
@@ -213,6 +214,7 @@
     <Compile Include="GameWindow.cs" />
     <Compile Include="GraphicsDeviceInformation.cs" />
     <Compile Include="Graphics\BasicEffect.cs" />
+    <Compile Include="Graphics\ConstantBuffer.cs" />
     <Compile Include="Graphics\DeviceLostException.cs" />
     <Compile Include="Graphics\DisplayMode.cs" />
     <Compile Include="Graphics\DisplayModeCollection.cs" />
@@ -414,8 +416,10 @@
     <Compile Include="NonXNA\AddInLoadingException.cs" />
     <Compile Include="NonXNA\AddInTypeCollection.cs" />
     <Compile Include="NonXNA\AddInType.cs" />
+    <Compile Include="NonXNA\Development\DeveloperAttribute.cs" />
     <Compile Include="NonXNA\Development\TestStateAttribute.cs" />
     <Compile Include="NonXNA\Development\PercentageCompleteAttribute.cs" />
+    <Compile Include="NonXNA\EffectSourceLanguage.cs" />
     <Compile Include="NonXNA\InputDeviceFactory.cs" />
     <Compile Include="NonXNA\InputSystem\IGamePadCreator.cs" />
     <Compile Include="NonXNA\InputSystem\IKeyboard.cs" />
@@ -438,6 +442,7 @@
     <Compile Include="NonXNA\PlatformSystem\INativeContentManager.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeMediaLibrary.cs" />
     <Compile Include="NonXNA\Reflection\AssemblyLoader.cs" />
+    <Compile Include="NonXNA\RenderSystem\INativeConstantBuffer.cs" />
     <Compile Include="NonXNA\SoundSystem\IMicrophone.cs" />
     <Compile Include="NonXNA\Windows8\AssetsHelper.cs" />
     <Compile Include="NonXNA\Windows8\IServiceProvider.cs" />
@@ -501,9 +506,7 @@
     <Compile Include="Vector3.cs" />
     <Compile Include="Vector4.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\MediaTypeReaders\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
index a9308533..be00d2ba 100644
--- a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
+++ b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -36,10 +36,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
     <OutputPath>bin\DebugWin8\</OutputPath>
+    <DefineConstants>XNAEXT;LINUX;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
     <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
index d48573f9..a04b79aa 100644
--- a/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
+++ b/RenderSystems/ANX.Framework.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -36,10 +36,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
     <OutputPath>bin\DebugWin8\</OutputPath>
+    <DefineConstants>XNAEXT;PSVITA;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
     <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_Linux.csproj b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_Linux.csproj
index ff86b18a..6b1e011a 100644
--- a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_Linux.csproj
+++ b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_Linux.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
diff --git a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_PSVita.csproj b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_PSVita.csproj
index bf39998f..5177132c 100644
--- a/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_PSVita.csproj
+++ b/RenderSystems/ANX.Framework.Windows.GL3/ANX.RenderSystem.Windows.GL3_PSVita.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
diff --git a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_Linux.csproj b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_Linux.csproj
index de315e9b..958a4518 100644
--- a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_Linux.csproj
+++ b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_Linux.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_PSVita.csproj b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_PSVita.csproj
index d8488bc2..a7335228 100644
--- a/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.PsVita/ANX.RenderSystem.PsVita_PSVita.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj
index 2fade836..ca99bd97 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_Linux.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -39,10 +39,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|x86'">
     <OutputPath>bin\x86\DebugWin8\</OutputPath>
+    <DefineConstants>XNAEXT;LINUX;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|x86'">
     <OutputPath>bin\x86\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
index a1834409..04dadfbb 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/ANX.RenderSystem.Windows.DX11_PSVita.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -39,10 +39,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|x86'">
     <OutputPath>bin\x86\DebugWin8\</OutputPath>
+    <DefineConstants>XNAEXT;PSVITA;</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|x86'">
     <OutputPath>bin\x86\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_Linux.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_Linux.csproj
index b35d3fce..e41eb0ea 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_Linux.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_Linux.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
index 0970d5ee..111d5d62 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/ANX.RenderSystem.Windows.Metro_PSVita.csproj
@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/Samples/AudioSample/AudioSample_Linux.csproj b/Samples/AudioSample/AudioSample_Linux.csproj
new file mode 100644
index 00000000..eec2db67
--- /dev/null
+++ b/Samples/AudioSample/AudioSample_Linux.csproj
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AudioSample</RootNamespace>
+    <AssemblyName>AudioSample</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
+    <XnaPlatform>Windows</XnaPlatform>
+    <XnaProfile>HiDef</XnaProfile>
+    <XnaCrossPlatformGroupID>4b57417a-c755-4652-a34c-9beb83e18811</XnaCrossPlatformGroupID>
+    <XnaOutputType>Game</XnaOutputType>
+    <ApplicationIcon>Game.ico</ApplicationIcon>
+    <Thumbnail>GameThumbnail.png</Thumbnail>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;DEBUG;LINUX;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>false</XnaCompressContent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;LINUX;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>true</XnaCompressContent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Game1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Game.ico" />
+    <Content Include="GameThumbnail.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_Linux.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_Linux.csproj">
+      <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
+      <Name>ANX.InputDevices.Windows.XInput</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_Linux.csproj">
+      <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
+      <Name>ANX.InputSystem.Standard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_Linux.csproj">
+      <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
+      <Name>ANX.PlatformSystem.Windows</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_Linux.csproj">
+      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
+      <Name>ANX.RenderSystem.Windows.DX10</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_Linux.csproj">
+      <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
+      <Name>ANX.SoundSystem.OpenAL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
+      <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
+      <Name>SampleContent</Name>
+      <XnaReferenceType>Content</XnaReferenceType>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\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/Samples/AudioSample/AudioSample_PSVita.csproj b/Samples/AudioSample/AudioSample_PSVita.csproj
new file mode 100644
index 00000000..7fd6bbe0
--- /dev/null
+++ b/Samples/AudioSample/AudioSample_PSVita.csproj
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}</ProjectGuid>
+    <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AudioSample</RootNamespace>
+    <AssemblyName>AudioSample</AssemblyName>
+    <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
+    <XnaPlatform>Windows</XnaPlatform>
+    <XnaProfile>HiDef</XnaProfile>
+    <XnaCrossPlatformGroupID>4b57417a-c755-4652-a34c-9beb83e18811</XnaCrossPlatformGroupID>
+    <XnaOutputType>Game</XnaOutputType>
+    <ApplicationIcon>Game.ico</ApplicationIcon>
+    <Thumbnail>GameThumbnail.png</Thumbnail>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <ProductVersion>10.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;DEBUG;PSVITA;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>false</XnaCompressContent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>WINDOWS;TRACE;PSVITA;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <XnaCompressContent>true</XnaCompressContent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib" />
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Game1.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Game.ico" />
+    <Content Include="GameThumbnail.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
+      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
+      <Name>ANX.Framework</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_PSVita.csproj">
+      <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
+      <Name>ANX.InputDevices.Windows.XInput</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\InputSystems\ANX.InputSystem.Standard\ANX.InputSystem.Standard_PSVita.csproj">
+      <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
+      <Name>ANX.InputSystem.Standard</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows_PSVita.csproj">
+      <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
+      <Name>ANX.PlatformSystem.Windows</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
+      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
+      <Name>ANX.RenderSystem.Windows.DX10</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_PSVita.csproj">
+      <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
+      <Name>ANX.SoundSystem.OpenAL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SampleContent\SampleContent.contentproj">
+      <Project>{FA6E229D-4504-47B1-8A23-2D3FCC13F778}</Project>
+      <Name>SampleContent</Name>
+      <XnaReferenceType>Content</XnaReferenceType>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Xna.Framework.4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft XNA Framework Redistributable 4.0</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
+  <!--
+      To modify your build process, add your task inside one of the targets below and uncomment it. 
+      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/Samples/KeyboardSample/KeyboardSample_Linux.csproj b/Samples/KeyboardSample/KeyboardSample_Linux.csproj
index 1c9b8989..61f0f28a 100644
--- a/Samples/KeyboardSample/KeyboardSample_Linux.csproj
+++ b/Samples/KeyboardSample/KeyboardSample_Linux.csproj
@@ -59,6 +59,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|x86'">
     <OutputPath>bin\x86\DebugWin8\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|x86'">
     <OutputPath>bin\x86\ReleaseWin8\</OutputPath>
@@ -77,6 +78,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>KeyboardSample.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/Samples/KeyboardSample/KeyboardSample_PSVita.csproj b/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
index 26152272..ec943c09 100644
--- a/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
+++ b/Samples/KeyboardSample/KeyboardSample_PSVita.csproj
@@ -61,6 +61,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|x86'">
     <OutputPath>bin\x86\DebugWin8\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|x86'">
     <OutputPath>bin\x86\ReleaseWin8\</OutputPath>
@@ -79,6 +80,9 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>KeyboardSample.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
diff --git a/Samples/SimpleSprite/SimpleSprite_Linux.csproj b/Samples/SimpleSprite/SimpleSprite_Linux.csproj
index 8feba1d3..db0f790d 100644
--- a/Samples/SimpleSprite/SimpleSprite_Linux.csproj
+++ b/Samples/SimpleSprite/SimpleSprite_Linux.csproj
@@ -105,6 +105,10 @@
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_Linux.csproj">
+      <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
+      <Name>ANX.SoundSystem.OpenAL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_Linux.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/SimpleSprite/SimpleSprite_PSVita.csproj b/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
index 7e8b8d7b..11a300ca 100644
--- a/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
+++ b/Samples/SimpleSprite/SimpleSprite_PSVita.csproj
@@ -108,6 +108,10 @@
       <Project>{B30DE9C2-0926-46B6-8351-9AF276C472D5}</Project>
       <Name>ANX.RenderSystem.Windows.DX11</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.OpenAL\ANX.SoundSystem.OpenAL_PSVita.csproj">
+      <Project>{14EF49AB-6D3F-458D-9D5C-D120B86EDD7A}</Project>
+      <Name>ANX.SoundSystem.OpenAL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\SoundSystems\ANX.SoundSystem.Windows.XAudio\ANX.SoundSystem.Windows.XAudio_PSVita.csproj">
       <Project>{6A582788-C4D2-410C-96CD-177F75712D65}</Project>
       <Name>ANX.SoundSystem.Windows.XAudio</Name>
diff --git a/Samples/WindowsGame/WindowsGame_Linux.csproj b/Samples/WindowsGame/WindowsGame_Linux.csproj
index a0d114ba..48787a0a 100644
--- a/Samples/WindowsGame/WindowsGame_Linux.csproj
+++ b/Samples/WindowsGame/WindowsGame_Linux.csproj
@@ -122,10 +122,6 @@
       <Project>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</Project>
       <Name>ANX.InputDevices.OpenTK</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_Linux.csproj">
-      <Project>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</Project>
-      <Name>ANX.InputDevices.Windows.Kinect</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_Linux.csproj">
       <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
       <Name>ANX.InputDevices.Windows.XInput</Name>
diff --git a/Samples/WindowsGame/WindowsGame_PSVita.csproj b/Samples/WindowsGame/WindowsGame_PSVita.csproj
index 20dc48c3..ef9ee0a2 100644
--- a/Samples/WindowsGame/WindowsGame_PSVita.csproj
+++ b/Samples/WindowsGame/WindowsGame_PSVita.csproj
@@ -125,10 +125,6 @@
       <Project>{5CA3CDF5-4D2C-42AC-AD08-641BD3992B75}</Project>
       <Name>ANX.InputDevices.OpenTK</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.Kinect\ANX.InputDevices.Windows.Kinect_PSVita.csproj">
-      <Project>{E5D69E75-D77C-493F-BBDA-6F9E73B82549}</Project>
-      <Name>ANX.InputDevices.Windows.Kinect</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\InputSystems\ANX.InputDevices.Windows.XInput\ANX.InputDevices.Windows.XInput_PSVita.csproj">
       <Project>{60D08399-244F-46A3-91F1-4CFD26D961A3}</Project>
       <Name>ANX.InputDevices.Windows.XInput</Name>
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_Linux.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_Linux.csproj
index 41e8ea79..b67aac47 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_Linux.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_Linux.csproj
@@ -70,18 +70,16 @@
     <Compile Include="OpenALSoundEffectInstance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
-    <Compile Include="Wave\ALaw.cs" />
-    <Compile Include="Wave\MsAdpcm.cs" />
-    <Compile Include="Wave\MuLaw.cs" />
-    <Compile Include="Wave\WaveFile.cs" />
-    <Compile Include="Wave\WaveFormat.cs" />
-    <Compile Include="Wave\WaveInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_Linux.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</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. 
diff --git a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
index d55911fe..d238081c 100644
--- a/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
+++ b/SoundSystems/ANX.SoundSystem.OpenAL/ANX.SoundSystem.OpenAL_PSVita.csproj
@@ -71,18 +71,16 @@
     <Compile Include="OpenALSoundEffectInstance.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SupportedPlatformsImpl.cs" />
-    <Compile Include="Wave\ALaw.cs" />
-    <Compile Include="Wave\MsAdpcm.cs" />
-    <Compile Include="Wave\MuLaw.cs" />
-    <Compile Include="Wave\WaveFile.cs" />
-    <Compile Include="Wave\WaveFormat.cs" />
-    <Compile Include="Wave\WaveInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tools\WaveUtils\WaveUtils.csproj">
+      <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
+      <Name>WaveUtils</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 6315eff1..8276ea5c 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -308,42 +308,6 @@
     </foreach>
   </target>
 
-  <target name="samples" description="Build ANX.Framework samples">
-    <!-- default windows fileset -->
-    <fileset id="sample_files" basedir="../Samples/">
-      <include name="**/*.csproj" />
-
-      <exclude name="**/*Kinect*.csproj" />
-      
-      <exclude name="**/*PSVita*.csproj" />
-      <exclude name="**/*Metro*.csproj" />
-      <exclude name="**/*Linux*.csproj" />
-    </fileset>
-
-    <foreach item="File" property="projectFile">
-      <in>
-        <items refid="sample_files" />
-      </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}/samples/${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>
-  
   <target name="platformsystem" description="Build ANX.Framework PlatformSystems">
     <!-- default windows fileset -->
     <fileset id="platformsystem_files" basedir="../PlatformSystems/">
@@ -370,7 +334,7 @@
         <include name="**/*Metro*_WindowsMetro.csproj" />
       </fileset>
     </if>
-    
+
     <foreach item="File" property="projectFile">
       <in>
         <items refid="platformsystem_files" />
@@ -393,6 +357,79 @@
       </do>
     </foreach>
   </target>
+  
+  <target name="generate_stock_shaders" description="Generate code for stock shaders" depends="tools">
+    <foreach item="File" property="buildFile">
+      <in>
+        <items basedir="../shader/">
+          <include name="**/build.xml" />
+          <exclude name="**/*Metro*/build.xml" unless="${project.anx.metro}" />
+        </items>
+      </in>
+      <do>
+        <echo message="generating: ${path::get-file-name(path::get-directory-name(buildFile))}" />
+        
+        <exec program="../bin/sscg.exe" >
+          <arg value="${buildFile}" />
+          <arg value="/silent" />
+        </exec>
+      </do>
+    </foreach>    
+  </target>
+
+  <target name="samples" description="Build ANX.Framework samples">
+    <!-- default windows fileset -->
+    <fileset id="sample_files" basedir="../Samples/">
+      <include name="**/*.csproj" />
+
+      <exclude name="**/*Kinect*.csproj" />
+
+      <exclude name="**/*PSVita*.csproj" />
+      <exclude name="**/*Metro*.csproj" />
+      <exclude name="**/*Linux*.csproj" />
+    </fileset>
+
+    <if test="${project.anx.linux}">
+      <fileset id="sample_files" basedir="../Samples/">
+        <include name="**/*_Linux.csproj" />
+      </fileset>
+    </if>
+
+    <if test="${project.anx.psvita}">
+      <fileset id="sample_files" basedir="../Samples/">
+        <include name="**/*_PsVita.csproj" />
+      </fileset>
+    </if>
+
+    <if test="${project.anx.metro}">
+      <fileset id="sample_files" basedir="../Samples/">
+        <include name="**/*_WindowsMetro.csproj" />
+      </fileset>
+    </if>
+
+    <foreach item="File" property="projectFile">
+      <in>
+        <items refid="sample_files" />
+      </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}/samples/${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>
 
   <target name="tools" description="Build ANX.Framework tools" unless="${target::has-executed('tools')}">
     <foreach item="File" property="projectFile">
@@ -440,25 +477,6 @@
     </exec>
   </target>
 
-  <target name="generate_stock_shaders" description="Generate code for stock shaders" depends="tools">
-    <foreach item="File" property="buildFile">
-      <in>
-        <items basedir="../shader/">
-          <include name="**/build.xml" />
-          <exclude name="**/*Metro*/build.xml" unless="${project.anx.metro}" />
-        </items>
-      </in>
-      <do>
-        <echo message="generating: ${path::get-file-name(path::get-directory-name(buildFile))}" />
-        
-        <exec program="../bin/sscg.exe" >
-          <arg value="${buildFile}" />
-          <arg value="/silent" />
-        </exec>
-      </do>
-    </foreach>    
-  </target>
-
   <target name="create_packages" description="generates all type of packages">
     <call target="create_zip_packages" />
     <call target="create_msi_packages" />
@@ -521,6 +539,7 @@
       <include name="InputSystems/**/*.csproj" />
       <include name="PlatformSystems/**/*.csproj" />
       <include name="SoundSystems/**/*.csproj" />
+      <include name="Samples/**/*.csproj" />
       <exclude name="**/*_Linux.csproj" />
       <exclude name="**/*_PSVita.csproj" />
       <exclude name="**/*_WindowsMetro.csproj" />