diff --git a/build/EmbedXaml.props b/build/EmbedXaml.props
index dba14521ab..7ce0366dea 100644
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@@ -8,4 +8,4 @@
       <SubType>Designer</SubType>
     </AvaloniaResource>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/samples/BindingDemo/BindingDemo.csproj b/samples/BindingDemo/BindingDemo.csproj
index b28ab5fd8a..3005fdbc51 100644
--- a/samples/BindingDemo/BindingDemo.csproj
+++ b/samples/BindingDemo/BindingDemo.csproj
@@ -14,4 +14,5 @@
   <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/RemoteDemo/RemoteDemo.csproj b/samples/RemoteDemo/RemoteDemo.csproj
index 046999e06e..2d7699561a 100644
--- a/samples/RemoteDemo/RemoteDemo.csproj
+++ b/samples/RemoteDemo/RemoteDemo.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\SampleApp.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
-
+  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/RenderDemo/App.xaml b/samples/RenderDemo/App.xaml
index aee75cb139..db088417e7 100644
--- a/samples/RenderDemo/App.xaml
+++ b/samples/RenderDemo/App.xaml
@@ -1,4 +1,6 @@
-<Application xmlns="https://github.com/avaloniaui">
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Class="RenderDemo.App">
   <Application.Styles>
     <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
     <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
diff --git a/samples/RenderDemo/MainWindow.xaml b/samples/RenderDemo/MainWindow.xaml
index c15abad188..5705cd942d 100644
--- a/samples/RenderDemo/MainWindow.xaml
+++ b/samples/RenderDemo/MainWindow.xaml
@@ -1,8 +1,11 @@
-<Window xmlns="https://github.com/avaloniaui"
-        Title="AvaloniaUI Rendering Test"
-        xmlns:pages="clr-namespace:RenderDemo.Pages"
-        Width="800"
-        Height="600">
+<Window
+      xmlns="https://github.com/avaloniaui"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      x:Class="RenderDemo.MainWindow"
+      Title="AvaloniaUI Rendering Test"
+      xmlns:pages="clr-namespace:RenderDemo.Pages"
+      Width="800"
+      Height="600">
   <DockPanel>
     <Menu DockPanel.Dock="Top">
       <MenuItem Header="Rendering">
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index b5a8ff6dea..c5ad1fbfc8 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -1,6 +1,7 @@
-<UserControl
-xmlns="https://github.com/avaloniaui"
-xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<UserControl 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  x:Class="RenderDemo.Pages.AnimationsPage">
   <UserControl.Styles>
     <Styles>
       <Styles.Resources>
diff --git a/samples/RenderDemo/Pages/ClippingPage.xaml b/samples/RenderDemo/Pages/ClippingPage.xaml
index ca1b297363..802972a2c5 100644
--- a/samples/RenderDemo/Pages/ClippingPage.xaml
+++ b/samples/RenderDemo/Pages/ClippingPage.xaml
@@ -1,9 +1,11 @@
-<UserControl
-xmlns="https://github.com/avaloniaui">
+<UserControl 
+  xmlns="https://github.com/avaloniaui" 
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+  x:Class="RenderDemo.Pages.ClippingPage">
   <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto">
     <Grid.Styles>
       <Styles>
-        <Style Selector="Border#clipped :pointerover">
+        <Style Selector="Border#clipped:pointerover">
           <Setter Property="Border.Background" Value="Crimson"/>
         </Style>
         <Style Selector="Border#clipChild">
@@ -17,11 +19,7 @@ xmlns="https://github.com/avaloniaui">
         </Style>
       </Styles>
     </Grid.Styles>
-    <Border Name="clipped"
-            Background="Yellow"
-            Width="100"
-            Height="100"
-            Clip="M 58.625 0.07421875
+    <Border Name="clipped" Background="Yellow" Width="100" Height="100" Clip="M 58.625 0.07421875
                   C 50.305778 0.26687364 42.411858 7.0346526 41.806641 15.595703
                   C 42.446442 22.063923 39.707425 13.710754 36.982422 12.683594
                   C 29.348395 6.1821635 16.419398 8.4359222 11.480469 17.195312
diff --git a/samples/RenderDemo/Pages/DrawingPage.xaml b/samples/RenderDemo/Pages/DrawingPage.xaml
index 3473591d9d..7bdadf586b 100644
--- a/samples/RenderDemo/Pages/DrawingPage.xaml
+++ b/samples/RenderDemo/Pages/DrawingPage.xaml
@@ -1,5 +1,7 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<UserControl 
+    xmlns="https://github.com/avaloniaui" 
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    x:Class="RenderDemo.Pages.DrawingPage">
     <UserControl.Styles>
         <Style>
             <Style.Resources>
diff --git a/samples/RenderDemo/RenderDemo.csproj b/samples/RenderDemo/RenderDemo.csproj
index b28ab5fd8a..3005fdbc51 100644
--- a/samples/RenderDemo/RenderDemo.csproj
+++ b/samples/RenderDemo/RenderDemo.csproj
@@ -14,4 +14,5 @@
   <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>
diff --git a/samples/VirtualizationDemo/VirtualizationDemo.csproj b/samples/VirtualizationDemo/VirtualizationDemo.csproj
index b28ab5fd8a..3005fdbc51 100644
--- a/samples/VirtualizationDemo/VirtualizationDemo.csproj
+++ b/samples/VirtualizationDemo/VirtualizationDemo.csproj
@@ -14,4 +14,5 @@
   <Import Project="..\..\build\ReactiveUI.props" />
   <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
   <Import Project="..\..\build\ReferenceCoreLibraries.props" />
+  <Import Project="..\..\build\BuildTargets.targets" />
 </Project>