diff --git a/Nuclex.Windows.Forms.csproj b/Nuclex.Windows.Forms.csproj
index 9924562..908d860 100644
--- a/Nuclex.Windows.Forms.csproj
+++ b/Nuclex.Windows.Forms.csproj
@@ -1,117 +1,75 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{BDC43D2A-7638-412E-976A-E7E115803A27}</ProjectGuid>
-    <ProjectTypeGuids>{9F340DF3-2AED-4330-AC16-78AC2D9B4738};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BDC43D2A-7638-412E-976A-E7E115803A27}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nuclex.Windows.Forms</RootNamespace>
     <AssemblyName>Nuclex.Windows.Forms</AssemblyName>
-    <XnaFrameworkVersion>v1.0</XnaFrameworkVersion>
-    <XnaPlatform>Windows</XnaPlatform>
-    <XNAGlobalContentPipelineAssemblies>Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</XNAGlobalContentPipelineAssemblies>
-    <XNAProjectContentPipelineAssemblies>
-    </XNAProjectContentPipelineAssemblies>
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\x86\Debug</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;UNITTEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <DocumentationFile>Documentation\Nuclex.Windows.Forms.xml</DocumentationFile>
+    <DocumentationFile>Documents\Nuclex.Windows.Forms.xml</DocumentationFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\x86\Release</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE;UNITTEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <DocumentationFile>Documentation\Nuclex.Windows.Forms.xml</DocumentationFile>
+    <DocumentationFile>Documents\Nuclex.Windows.Forms.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Xna.Framework">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Game">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="mscorlib">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="System" />
     <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="Properties\AssemblyInfo.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>AssemblyInfo</Name>
-    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Source\ProgressReporter\ProgressReporterForm.resx">
+      <DependentUpon>ProgressReporterForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Compile Include="Source\AsyncProgressBar\AsyncProgressBar.cs">
       <SubType>Component</SubType>
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>AsyncProgressBar</Name>
     </Compile>
     <Compile Include="Source\AsyncProgressBar\AsyncProgressBar.Designer.cs">
       <DependentUpon>AsyncProgressBar.cs</DependentUpon>
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>AsyncProgressBar.Designer</Name>
     </Compile>
     <Compile Include="Source\ContainerListView\ContainerListView.cs">
       <SubType>Component</SubType>
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ContainerListView</Name>
     </Compile>
     <Compile Include="Source\ContainerListView\ContainerListView.Designer.cs">
       <DependentUpon>ContainerListView.cs</DependentUpon>
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ContainerListView.Designer</Name>
-    </Compile>
-    <Compile Include="Source\ContainerListView\ListViewEmbeddedControl.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ListViewEmbeddedControl</Name>
-    </Compile>
-    <Compile Include="Source\ContainerListView\ListViewEmbeddedControlCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ListViewEmbeddedControlCollection</Name>
-    </Compile>
-    <Compile Include="Source\EmbeddedControlCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>EmbeddedControlCollection</Name>
     </Compile>
+    <Compile Include="Source\ContainerListView\ListViewEmbeddedControl.cs" />
+    <Compile Include="Source\ContainerListView\ListViewEmbeddedControlCollection.cs" />
+    <Compile Include="Source\EmbeddedControlCollection.cs" />
     <Compile Include="Source\ProgressReporter\ProgressReporterForm.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ProgressReporterForm</Name>
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Source\ProgressReporter\ProgressReporterForm.Designer.cs">
       <DependentUpon>ProgressReporterForm.cs</DependentUpon>
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ProgressReporterForm.Designer</Name>
     </Compile>
     <Compile Include="Source\TrackingBar\ToolStripTrackingBar.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ToolStripTrackingBar</Name>
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\TrackingBar\TrackingBar.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>TrackingBar</Name>
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Source\TrackingBar\TrackingBar.Designer.cs">
@@ -119,20 +77,15 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Nuclex.Support\Nuclex.Support %28PC%29.csproj">
-      <Project>{A696702E-AFAD-45E7-88FA-1E2520E5E746}</Project>
-      <Name>Nuclex.Support %28PC%29</Name>
-    </ProjectReference>
+    <Content Include="Documents\Nuclex.Windows.Forms.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Source\ProgressReporter\ProgressReporterForm.resx">
-      <DependentUpon>ProgressReporterForm.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <ProjectReference Include="..\Nuclex.Support\Nuclex.Support %28x86%29.csproj">
+      <Project>{471344D7-583D-4B40-BAC4-4E85E77441A9}</Project>
+      <Name>Nuclex.Support %28x86%29</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA\Game Studio Express\v1.0\Microsoft.Xna.ContentPipeline.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA\Game Studio Express\v1.0\Microsoft.Xna.Common.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">