Default template in code of LayoutTransformControl removed and added default template in theme

src/Perspex.Controls/LayoutTransformControl.cs

@@ -26,7 +26,6 @@ namespace Perspex.Controls
         {
             LayoutTransformProperty.Changed
                 .AddClassHandler<LayoutTransformControl>(x => x.OnLayoutTransformChanged);
-            TemplateProperty.OverrideDefaultValue<LayoutTransformControl>(_defaultTemplate);
         }
 
         public Transform LayoutTransform
@@ -45,18 +44,6 @@ namespace Perspex.Controls
         /// </summary>
         private const int DecimalsAfterRound = 4;
 
-        private static readonly FuncControlTemplate<LayoutTransformControl> _defaultTemplate =
-            new FuncControlTemplate<LayoutTransformControl>(control =>
-        {
-            return new Decorator()
-            {
-                Child = new ContentPresenter()
-                {
-                    [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty]
-                }
-            };
-        });
-
         /// <summary>
         /// RenderTransform/MatrixTransform applied to TransformRoot.
         /// </summary>

src/Perspex.Themes.Default/DefaultTheme.xaml

@@ -8,6 +8,7 @@
   <StyleInclude Source="resm:Perspex.Themes.Default.DropDownItem.xaml?assembly=Perspex.Themes.Default"/>
   <StyleInclude Source="resm:Perspex.Themes.Default.GridSplitter.xaml?assembly=Perspex.Themes.Default"/>
   <StyleInclude Source="resm:Perspex.Themes.Default.ItemsControl.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.LayoutTransformControl.xaml?assembly=Perspex.Themes.Default"/>
   <StyleInclude Source="resm:Perspex.Themes.Default.ListBox.xaml?assembly=Perspex.Themes.Default"/>
   <StyleInclude Source="resm:Perspex.Themes.Default.ListBoxItem.xaml?assembly=Perspex.Themes.Default"/>
   <StyleInclude Source="resm:Perspex.Themes.Default.Menu.xaml?assembly=Perspex.Themes.Default"/>

src/Perspex.Themes.Default/LayoutTransformControl.xaml

@@ -0,0 +1,12 @@
+<Style xmlns="https://github.com/perspex" Selector="LayoutTransformControl">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <ContentPresenter Name="PART_ContentPresenter"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Content="{TemplateBinding Content}" 
+                        Padding="{TemplateBinding Padding}"/>
+    </ControlTemplate>
+  </Setter>
+</Style>

src/Perspex.Themes.Default/Perspex.Themes.Default.csproj

@@ -200,6 +200,11 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="LayoutTransformControl.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.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.