diff --git a/samples/XamlTestApplicationPcl/Button.paml b/samples/XamlTestApplicationPcl/Button.paml
index f1618cab37..256ac94df9 100644
--- a/samples/XamlTestApplicationPcl/Button.paml
+++ b/samples/XamlTestApplicationPcl/Button.paml
@@ -7,13 +7,14 @@
     <Setter Property="HorizontalContentAlignment" Value="Center"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
     <Setter Property="Template">
-      <ControlTemplate TargetType="Button">
+      <ControlTemplate>
         <Border Name="border"
                 Padding="3"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}">
           <ContentPresenter Content="{TemplateBinding Content}"
+                            Margin="{TemplateBinding Padding}"
                             TextBlock.Foreground="{TemplateBinding Foreground}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
diff --git a/samples/XamlTestApplicationPcl/Carousel.paml b/samples/XamlTestApplicationPcl/Carousel.paml
new file mode 100644
index 0000000000..8c0c87143c
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/Carousel.paml
@@ -0,0 +1,16 @@
+<Style xmlns="https://github.com/perspex" Selector="Carousel">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}">
+        <CarouselPresenter Items="{TemplateBinding Items}"
+                           ItemsPanel="{TemplateBinding ItemsPanel}"
+                           Margin="{TemplateBinding Padding}"
+                           MemberSelector="{TemplateBinding MemberSelector}"
+                           SelectedIndex="{TemplateBinding SelectedIndex}"
+                           Transition="{TemplateBinding Transition}"/>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/CheckBox.paml b/samples/XamlTestApplicationPcl/CheckBox.paml
new file mode 100644
index 0000000000..66451feb9c
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/CheckBox.paml
@@ -0,0 +1,30 @@
+<Styles xmlns="https://github.com/perspex">
+  <Style Selector="CheckBox">
+    <Setter Property="BorderBrush" Value="#ff333333"/>
+    <Setter Property="BorderThickness" Value="2"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid ColumnDefinitions="Auto,*">
+          <Border BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}"
+                  Width="18"
+                  Height="18"
+                  VerticalAlignment="Center"/>
+          <Path Name="checkMark"
+                Fill="#ff333333"
+                Width="11"
+                Height="10"
+                Stretch="Uniform"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Data="M 1145.607177734375,430 C1145.607177734375,430 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1141.449951171875,435.0772705078125 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1139.232177734375,433.0999755859375 1138,434.5538330078125 1138,434.5538330078125 1138,434.5538330078125 1141.482177734375,438 1141.482177734375,438 1141.482177734375,438 1141.96875,437.9375 1141.96875,437.9375 1141.96875,437.9375 1147,431.34619140625 1147,431.34619140625 1147,431.34619140625 1145.607177734375,430 1145.607177734375,430 z"/>
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Content="{TemplateBinding Content}"
+                            Margin="4,0,0,0"
+                            VerticalAlignment="Center"
+                            Grid.Column="1"/>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+  </Style>
+</Styles>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.paml b/samples/XamlTestApplicationPcl/XamlTestApp.paml
index bf3dfb00aa..a06ad25a6e 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApp.paml
+++ b/samples/XamlTestApplicationPcl/XamlTestApp.paml
@@ -3,5 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Application.Styles>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Button.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.Carousel.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.CheckBox.paml"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index 2bd010854f..5d73328952 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -123,6 +123,12 @@
     <EmbeddedResource Include="XamlTestApp.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Carousel.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="CheckBox.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <EmbeddedResource Include="Button.paml">
       <SubType>Designer</SubType>
diff --git a/src/Markup/Perspex.Markup.Xaml/Templates/ControlTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/ControlTemplate.cs
index 0e7e8bbdd3..1136c63858 100644
--- a/src/Markup/Perspex.Markup.Xaml/Templates/ControlTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/ControlTemplate.cs
@@ -11,8 +11,6 @@ namespace Perspex.Markup.Xaml.Templates
 {
     public class ControlTemplate : IControlTemplate
     {
-        public Type TargetType { get; set; }
-
         [Content]
         public TemplateContent Content { get; set; }
 
diff --git a/src/Perspex.Controls/ContentControl.cs b/src/Perspex.Controls/ContentControl.cs
index 5bfbfdfa77..f051b31f65 100644
--- a/src/Perspex.Controls/ContentControl.cs
+++ b/src/Perspex.Controls/ContentControl.cs
@@ -102,7 +102,7 @@ namespace Perspex.Controls
             // We allow ContentControls without ContentPresenters in the template. This can be
             // useful for e.g. a simple ToggleButton that displays an image. There's no need to
             // have a ContentPresenter in the visual tree for that.
-            Presenter = this.FindTemplateChild<ContentPresenter>("contentPresenter");
+            Presenter = this.FindTemplateChild<ContentPresenter>("PART_ContentPresenter");
         }
     }
 }
diff --git a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
index 4c62f8b812..ca47bf8571 100644
--- a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
@@ -217,8 +217,7 @@ namespace Perspex.Controls.UnitTests
             target.Content = null;
 
             // Need to call ApplyTemplate on presenter for CollectionChanged to be called.
-            var presenter = target.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
-            presenter.ApplyTemplate();
+            target.Presenter.ApplyTemplate();
 
             Assert.True(called);
         }
@@ -240,8 +239,7 @@ namespace Perspex.Controls.UnitTests
             contentControl.Content = child2;
 
             // Need to call ApplyTemplate on presenter for CollectionChanged to be called.
-            var presenter = contentControl.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
-            presenter.ApplyTemplate();
+            contentControl.Presenter.ApplyTemplate();
 
             Assert.True(called);
         }
@@ -295,7 +293,7 @@ namespace Perspex.Controls.UnitTests
                     Background = new Media.SolidColorBrush(0xffffffff),
                     Child = new ContentPresenter
                     {
-                        Name = "contentPresenter",
+                        Name = "PART_ContentPresenter",
                         [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                     }
                 };
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
index 7c2db5e86a..28da8d75e3 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
@@ -277,7 +277,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             return new ContentPresenter
             {
-                Name = "contentPresenter",
+                Name = "PART_ContentPresenter",
                 [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
             };
         }
diff --git a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index 43a32199d4..40949e624a 100644
--- a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -65,7 +65,7 @@ namespace Perspex.Controls.UnitTests.Utils
             {
                 return new ContentPresenter
                 {
-                    Name = "contentPresenter",
+                    Name = "PART_ContentPresenter",
                     [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                 };
             });