diff --git a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
index 0464ffe8..6cfecddc 100644
--- a/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
+++ b/ANX.Framework.Content.Pipeline/ANX.Framework.Content.Pipeline_PSVita.csproj
@@ -62,6 +62,23 @@
     <Compile Include="ContentProcessor.cs" />
     <Compile Include="ContentProcessorAttribute.cs" />
     <Compile Include="ContentProcessorContext.cs" />
+    <Compile Include="Helpers\DX11MetroShaderCodeGenerator\CompiledPass.cs" />
+    <Compile Include="Helpers\DX11MetroShaderCodeGenerator\MetroCodeGenerator.cs" />
+    <Compile Include="Helpers\GL3\ShaderHelper.cs" />
+    <Compile Include="Helpers\GL3\ShaderData.cs" />
+    <Compile Include="Helpers\HLSLParser\CommentRemover.cs" />
+    <Compile Include="Helpers\HLSLParser\EffectBuffer.cs" />
+    <Compile Include="Helpers\HLSLParser\EffectFile.cs" />
+    <Compile Include="Helpers\HLSLParser\IShaderElement.cs" />
+    <Compile Include="Helpers\HLSLParser\Method.cs" />
+    <Compile Include="Helpers\HLSLParser\Parser.cs" />
+    <Compile Include="Helpers\HLSLParser\ParseTextWalker.cs" />
+    <Compile Include="Helpers\HLSLParser\Pass.cs" />
+    <Compile Include="Helpers\HLSLParser\Sampler.cs" />
+    <Compile Include="Helpers\HLSLParser\Structure.cs" />
+    <Compile Include="Helpers\HLSLParser\Technique.cs" />
+    <Compile Include="Helpers\HLSLParser\TypeDef.cs" />
+    <Compile Include="Helpers\HLSLParser\Variable.cs" />
     <Compile Include="Importer\EffectImporter.cs" />
     <Compile Include="ExternalReference.cs" />
     <Compile Include="Importer\FbxImporter.cs" />
@@ -145,17 +162,20 @@
     <Compile Include="Processors\VertexBufferContent.cs" />
     <Compile Include="Processors\VertexDeclarationContent.cs" />
     <Compile Include="Processors\VideoProcessor.cs" />
+    <Compile Include="Serialization\Compiler\ArrayWriter.cs" />
     <Compile Include="Serialization\Compiler\BuiltInTypeWriter.cs" />
     <Compile Include="Serialization\Compiler\ContentCompiler.cs" />
     <Compile Include="Serialization\Compiler\ContentTypeWriter.cs" />
     <Compile Include="Serialization\Compiler\ContentTypeWriterAttribute.cs" />
     <Compile Include="Serialization\Compiler\ContentWriter.cs" />
+    <Compile Include="Serialization\Compiler\EnumWriter.cs" />
     <Compile Include="Serialization\Compiler\GenericContentTypeWriter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\EffectWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\Texture2DWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\SpriteFontWriter.cs" />
     <Compile Include="Serialization\Compiler\GraphicTypeWriters\TextureWriter.cs" />
+    <Compile Include="Serialization\Compiler\ListWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingBoxWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingSphereWriter.cs" />
     <Compile Include="Serialization\Compiler\MathTypeWriters\BoundingFrustumWriter.cs" />
@@ -180,6 +200,7 @@
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\ObjectWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\StringWriter.cs" />
     <Compile Include="Serialization\Compiler\PrimitiveTypeWriters\SingleWriter.cs" />
+    <Compile Include="Serialization\Compiler\SystemTypeWriters\CharWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\DateTimeWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\DecimalWriter.cs" />
     <Compile Include="Serialization\Compiler\SystemTypeWriters\NullableWriter.cs" />
@@ -201,10 +222,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3_PSVita.csproj">
-      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
-      <Name>ANX.RenderSystem.GL3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Support\WaveUtils\WaveUtils_PSVita.csproj">
       <Project>{1986B0ED-3D28-4FEE-82D0-BCC39C87C18C}</Project>
       <Name>WaveUtils</Name>
diff --git a/ANX.Framework/ANX.Framework_Linux.csproj b/ANX.Framework/ANX.Framework_Linux.csproj
index bfce8852..21be853f 100644
--- a/ANX.Framework/ANX.Framework_Linux.csproj
+++ b/ANX.Framework/ANX.Framework_Linux.csproj
@@ -11,6 +11,7 @@
     <ProjectGuid>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</ProjectGuid>
     <RootNamespace>ANX.Framework</RootNamespace>
     <AssemblyName>ANX.Framework</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj
index 5414a133..819fc399 100644
--- a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj
+++ b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_Linux.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Sce.PlayStation.Core">
diff --git a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj
index bea6d676..ffbbe07f 100644
--- a/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj
+++ b/InputSystems/ANX.InputDevices.PsVita/ANX.InputDevices.PsVita_PSVita.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Sce.PlayStation.Core">
diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj
index 48932fb2..940dab3d 100644
--- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj
+++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_Linux.csproj
@@ -14,7 +14,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
diff --git a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj
index 0d9c7504..c70a29a7 100644
--- a/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj
+++ b/InputSystems/ANX.InputDevices.Windows.Kinect/ANX.InputDevices.Windows.Kinect_PSVita.csproj
@@ -14,7 +14,7 @@
     <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -24,7 +24,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
index 5f95f7d0..fe90ac3f 100644
--- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
+++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_Linux.csproj
@@ -20,7 +20,7 @@
     <DefineConstants>XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -31,7 +31,7 @@
     <DefineConstants>XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj
index e464c6d3..e16d889e 100644
--- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj
+++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_PSVita.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -32,7 +32,7 @@
     <DefineConstants>XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
index cf23137b..79eac468 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_Linux.csproj
@@ -20,8 +20,8 @@
     <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>XNAEXT DX10;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31,7 +31,7 @@
     <DefineConstants>XNAEXT DX10;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
index c2483902..6d6cdbe0 100644
--- a/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
+++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/ANX.RenderSystem.Windows.DX10_PSVita.csproj
@@ -20,8 +20,8 @@
     <OutputPath>..\..\bin\Debug\</OutputPath>
     <DefineConstants>XNAEXT DX10;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <WarningLevel>0</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -31,7 +31,7 @@
     <DefineConstants>XNAEXT DX10;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
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 802b95c3..6d6f6d93 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
@@ -14,22 +14,22 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT DX11;DEBUG;TRACE;LINUX;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;DEBUG;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT DX11;TRACE;LINUX;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -42,10 +42,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
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 3b11c99c..2c9e1d5e 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
@@ -14,22 +14,22 @@
     <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\Debug\</OutputPath>
-    <DefineConstants>XNAEXT DX11;DEBUG;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;DEBUG;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\Release\</OutputPath>
-    <DefineConstants>XNAEXT DX11;TRACE;PSVITA;</DefineConstants>
+    <DefineConstants>DX11;XNAEXT;TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -42,14 +42,6 @@
       <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
       <Name>ANX.Framework</Name>
     </ProjectReference>
-    <ProjectReference Include="..\ANX.BaseDirectX\ANX.BaseDirectX.csproj">
-      <Project>{A4D3AD34-E49C-4142-8620-2AFF44ED6719}</Project>
-      <Name>ANX.BaseDirectX</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10_PSVita.csproj">
-      <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
-      <Name>ANX.RenderSystem.Windows.DX10</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="SharpDX, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/Samples/SimpleNoContent/Manifest.appxmanifest b/Samples/SimpleNoContent/Manifest.appxmanifest
index f808b52f..e2b4fa18 100644
--- a/Samples/SimpleNoContent/Manifest.appxmanifest
+++ b/Samples/SimpleNoContent/Manifest.appxmanifest
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-  <Identity Name="SimpleNoContent" Publisher="CN=Roland" Version="1.0.0.0" />
+  <Identity Name="SimpleNoContent" Publisher="CN=ANX-Team" Version="1.0.0.0" />
   <Properties>
     <DisplayName>SimpleNoContent</DisplayName>
     <PublisherDisplayName>ANX Developer Team</PublisherDisplayName>
diff --git a/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj b/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj
index c456430f..94da87d1 100644
--- a/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj
+++ b/Samples/SimpleNoContent/SimpleNoContent_Linux.csproj
@@ -35,15 +35,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Game1.cs" />
diff --git a/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj b/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj
index a59bc8d0..fcc41dbf 100644
--- a/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj
+++ b/Samples/SimpleNoContent/SimpleNoContent_PSVita.csproj
@@ -38,15 +38,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Game1.cs" />
diff --git a/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj b/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj
index 6a1572cb..dea11f15 100644
--- a/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj
+++ b/Samples/SimpleNoContent/SimpleNoContent_WindowsMetro.csproj
@@ -11,8 +11,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <PackageCertificateKeyFile>SimpleNoContent_WindowsMetro_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>1C2E795E3865B788B3FBA2FE1F8BB56353190C08</PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,6 +35,9 @@
   <PropertyGroup>
     <ApplicationIcon>anx.ico</ApplicationIcon>
   </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Game1.cs" />
     <Compile Include="Program.cs" />
@@ -70,7 +72,6 @@
   </Target>
   -->
   <ItemGroup>
-    <None Include="SimpleNoContent_WindowsMetro_TemporaryKey.pfx" />
     <None Include="Test_TemporaryKey.pfx" />
     <AppxManifest Include="Manifest.appxmanifest">
       <SubType>Designer</SubType>
diff --git a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj
index 9f3c8c8f..7c3314fa 100644
--- a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj
+++ b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_Linux.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE;LINUX;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj
index 9b10cca5..131a813b 100644
--- a/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj
+++ b/SoundSystems/ANX.SoundSystem.PsVita/ANX.SoundSystem.PsVita_PSVita.csproj
@@ -21,7 +21,7 @@
     <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
     <DefineConstants>TRACE;PSVITA;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 7b4eab43..752f0df4 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -275,12 +275,33 @@
   </target>
   
   <target name="generate_stock_shaders" description="Generate code for stock shaders" depends="tools">
+    <!-- default windows fileset -->
+    <fileset id="stock_shaders" basedir="../shader/">
+      <include name="**/build.xml" />
+      <exclude name="**/*Metro*/build.xml" />
+    </fileset>
+
+    <if test="${project.anx.linux}">
+      <fileset id="stock_shaders" basedir="../shader/">
+        <include name="**/GL3/build.xml" />
+      </fileset>
+    </if>
+
+    <if test="${project.anx.psvita}">
+      <fileset id="stock_shaders" basedir="../shader/">
+        <exclude name="**/build.xml" />
+      </fileset>
+    </if>
+
+    <if test="${project.anx.metro}">
+      <fileset id="stock_shaders" basedir="../shader/">
+        <include name="**/*Metro*/build.xml" />
+      </fileset>
+    </if>
+    
     <foreach item="File" property="buildFile">
       <in>
-        <items basedir="../shader/">
-          <include name="**/build.xml" />
-          <exclude name="**/*Metro*/build.xml" unless="${project.anx.metro}" />
-        </items>
+        <items refid="stock_shaders" />
       </in>
       <do>
         <echo message="generating: ${path::get-file-name(path::get-directory-name(buildFile))}" />