diff --git a/src/Perspex.Themes.Default/Button.xaml b/src/Perspex.Themes.Default/Button.xaml
index 93c372adc6..114849b131 100644
--- a/src/Perspex.Themes.Default/Button.xaml
+++ b/src/Perspex.Themes.Default/Button.xaml
@@ -14,7 +14,6 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                           Padding="{TemplateBinding Padding}"
                           TextBlock.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Perspex.Themes.Default/CheckBox.xaml b/src/Perspex.Themes.Default/CheckBox.xaml
index 7452964213..d05e8b5cf6 100644
--- a/src/Perspex.Themes.Default/CheckBox.xaml
+++ b/src/Perspex.Themes.Default/CheckBox.xaml
@@ -22,7 +22,6 @@
           </Border>
           <ContentPresenter Name="PART_ContentPresenter"
                             Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
                             Margin="4,0,0,0"
                             VerticalAlignment="Center"
                             Grid.Column="1"/>
diff --git a/src/Perspex.Themes.Default/ContentControl.xaml b/src/Perspex.Themes.Default/ContentControl.xaml
index cce99a45e6..90e34c7d3c 100644
--- a/src/Perspex.Themes.Default/ContentControl.xaml
+++ b/src/Perspex.Themes.Default/ContentControl.xaml
@@ -5,8 +5,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
-                        DataContext="{TemplateBinding Content}" 
+                        Content="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Perspex.Themes.Default/DropDown.xaml b/src/Perspex.Themes.Default/DropDown.xaml
index a0340099a5..37dd47d49a 100644
--- a/src/Perspex.Themes.Default/DropDown.xaml
+++ b/src/Perspex.Themes.Default/DropDown.xaml
@@ -11,7 +11,6 @@
                 BorderThickness="{TemplateBinding BorderThickness}">
           <Grid ColumnDefinitions="*,Auto">
             <ContentPresenter Content="{TemplateBinding SelectionBoxItem}"
-                              DataContext="{TemplateBinding SelectionBoxItem}" 
                               Margin="{TemplateBinding Padding}"
                               HorizontalAlignment="Center"
                               VerticalAlignment="Center"/>
diff --git a/src/Perspex.Themes.Default/DropDownItem.xaml b/src/Perspex.Themes.Default/DropDownItem.xaml
index 69742258a6..4900c961e4 100644
--- a/src/Perspex.Themes.Default/DropDownItem.xaml
+++ b/src/Perspex.Themes.Default/DropDownItem.xaml
@@ -10,7 +10,6 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           Padding="{TemplateBinding Padding}"/>
diff --git a/src/Perspex.Themes.Default/Expander.xaml b/src/Perspex.Themes.Default/Expander.xaml
index 87728c555b..158f6514fd 100644
--- a/src/Perspex.Themes.Default/Expander.xaml
+++ b/src/Perspex.Themes.Default/Expander.xaml
@@ -17,7 +17,6 @@
                               Grid.Row="1"
                               IsVisible="{TemplateBinding IsExpanded}"
                               Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -35,7 +34,6 @@
                               Grid.Row="0"
                               IsVisible="{TemplateBinding IsExpanded}"
                               Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -53,7 +51,6 @@
                               Grid.Column="1"
                               IsVisible="{TemplateBinding IsExpanded}"
                               Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
@@ -71,7 +68,6 @@
                               Grid.Column="0"
                               IsVisible="{TemplateBinding IsExpanded}"
                               Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                               HorizontalAlignment="Stretch"
                               VerticalAlignment="Stretch" />
           </Grid>
diff --git a/src/Perspex.Themes.Default/LayoutTransformControl.xaml b/src/Perspex.Themes.Default/LayoutTransformControl.xaml
index 3d59fd4482..e393eedf83 100644
--- a/src/Perspex.Themes.Default/LayoutTransformControl.xaml
+++ b/src/Perspex.Themes.Default/LayoutTransformControl.xaml
@@ -6,7 +6,6 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         Content="{TemplateBinding Content}" 
-                        DataContext="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Perspex.Themes.Default/ListBoxItem.xaml b/src/Perspex.Themes.Default/ListBoxItem.xaml
index 7c22cd4b47..784731d57b 100644
--- a/src/Perspex.Themes.Default/ListBoxItem.xaml
+++ b/src/Perspex.Themes.Default/ListBoxItem.xaml
@@ -7,7 +7,6 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                           Padding="{TemplateBinding Padding}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Perspex.Themes.Default/MenuItem.xaml b/src/Perspex.Themes.Default/MenuItem.xaml
index 5b2fc5ec9e..2011bb041b 100644
--- a/src/Perspex.Themes.Default/MenuItem.xaml
+++ b/src/Perspex.Themes.Default/MenuItem.xaml
@@ -13,7 +13,6 @@
           <Grid ColumnDefinitions="22,13,*,20">
             <ContentPresenter Name="icon"
                               Content="{TemplateBinding Icon}"
-                              DataContext="{TemplateBinding Icon}" 
                               Width="16"
                               Height="16"
                               Margin="3"
@@ -27,7 +26,6 @@
                   VerticalAlignment="Center"/>
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                               Margin="{TemplateBinding Padding}"
                               VerticalAlignment="Center"
                               Grid.Column="2">
@@ -83,7 +81,6 @@
           <Panel>
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                               Margin="{TemplateBinding Padding}">
               <ContentPresenter.DataTemplates>
                 <DataTemplate DataType="sys:String">
diff --git a/src/Perspex.Themes.Default/RadioButton.xaml b/src/Perspex.Themes.Default/RadioButton.xaml
index 6e5c958331..8fc0b14179 100644
--- a/src/Perspex.Themes.Default/RadioButton.xaml
+++ b/src/Perspex.Themes.Default/RadioButton.xaml
@@ -21,7 +21,6 @@
                    VerticalAlignment="Center"/>
           <ContentPresenter Name="PART_ContentPresenter"
                             Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
                             Margin="4,0,0,0"
                             VerticalAlignment="Center"
                             Grid.Column="1"/>
diff --git a/src/Perspex.Themes.Default/TabStripItem.xaml b/src/Perspex.Themes.Default/TabStripItem.xaml
index 1ac77d6609..e32de4613b 100644
--- a/src/Perspex.Themes.Default/TabStripItem.xaml
+++ b/src/Perspex.Themes.Default/TabStripItem.xaml
@@ -9,7 +9,6 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                           Padding="{TemplateBinding Padding}"/>
       </ControlTemplate>
     </Setter>
diff --git a/src/Perspex.Themes.Default/ToggleButton.xaml b/src/Perspex.Themes.Default/ToggleButton.xaml
index 5f26051058..03354c9b27 100644
--- a/src/Perspex.Themes.Default/ToggleButton.xaml
+++ b/src/Perspex.Themes.Default/ToggleButton.xaml
@@ -14,7 +14,6 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                           Padding="{TemplateBinding Padding}"
                           TextBlock.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
diff --git a/src/Perspex.Themes.Default/ToolTip.xaml b/src/Perspex.Themes.Default/ToolTip.xaml
index 19af7c63bc..73bf2215ee 100644
--- a/src/Perspex.Themes.Default/ToolTip.xaml
+++ b/src/Perspex.Themes.Default/ToolTip.xaml
@@ -10,7 +10,6 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         Content="{TemplateBinding Content}" 
-                        DataContext="{TemplateBinding Content}" 
                         Padding="{TemplateBinding Padding}"/>
     </ControlTemplate>
   </Setter>
diff --git a/src/Perspex.Themes.Default/TreeViewItem.xaml b/src/Perspex.Themes.Default/TreeViewItem.xaml
index 072b5a0840..5e673d767f 100644
--- a/src/Perspex.Themes.Default/TreeViewItem.xaml
+++ b/src/Perspex.Themes.Default/TreeViewItem.xaml
@@ -13,7 +13,6 @@
                               BorderBrush="{TemplateBinding BorderBrush}"
                               BorderThickness="{TemplateBinding BorderThickness}"
                               Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                               Padding="{TemplateBinding Padding}"
                               TemplatedControl.IsTemplateFocusTarget="True"
                               Grid.Column="1"/>
diff --git a/src/Perspex.Themes.Default/Window.xaml b/src/Perspex.Themes.Default/Window.xaml
index 3dca88b9f4..4316626e58 100644
--- a/src/Perspex.Themes.Default/Window.xaml
+++ b/src/Perspex.Themes.Default/Window.xaml
@@ -6,10 +6,7 @@
     <ControlTemplate>
       <Border Background="{TemplateBinding Background}">
         <AdornerDecorator>
-          <ContentPresenter Name="PART_ContentPresenter" 
-                            Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
-                            Margin="{TemplateBinding Padding}"/>
+          <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
         </AdornerDecorator>
       </Border>
     </ControlTemplate>