From 81d7d76659563e4170e60f1ca271bceb3c536a09 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 6 Mar 2016 17:46:23 +0100
Subject: [PATCH] Renamed paml => xaml in files.

---
 samples/BindingTest/App.xaml                  |  4 +-
 samples/BindingTest/BindingTest.csproj        | 18 ++---
 samples/ControlCatalog/App.xaml               |  6 +-
 samples/ControlCatalog/ControlCatalog.csproj  | 56 +++++++--------
 samples/TestApplicationShared/App.cs          |  2 +-
 .../XamlTestApplicationPcl/XamlTestApp.xaml   |  4 +-
 .../XamlTestApplicationPcl.csproj             |  4 +-
 .../Perspex.Markup.Xaml/PerspexXamlLoader.cs  |  4 +-
 .../Designer/DesignerAssist.cs                |  2 +-
 .../Perspex.Diagnostics.csproj                | 12 ++--
 src/Perspex.Themes.Default/DefaultTheme.xaml  | 62 ++++++++--------
 .../Perspex.Themes.Default.csproj             | 70 +++++++++----------
 tests/Perspex.UnitTests/TestServices.cs       |  2 +-
 13 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/samples/BindingTest/App.xaml b/samples/BindingTest/App.xaml
index ce82a95bd6..b416385619 100644
--- a/samples/BindingTest/App.xaml
+++ b/samples/BindingTest/App.xaml
@@ -1,6 +1,6 @@
 <Application xmlns="https://github.com/perspex">
   <Application.Styles>
-    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.paml?assembly=Perspex.Themes.Default"/>
-    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.xaml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/BindingTest/BindingTest.csproj b/samples/BindingTest/BindingTest.csproj
index 02a7e0e728..406c5b1cfb 100644
--- a/samples/BindingTest/BindingTest.csproj
+++ b/samples/BindingTest/BindingTest.csproj
@@ -74,29 +74,29 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="App.paml">
+    <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <Compile Include="App.paml.cs">
-      <DependentUpon>App.paml</DependentUpon>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainWindow.paml.cs">
-      <DependentUpon>MainWindow.paml</DependentUpon>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestItemView.paml.cs">
-      <DependentUpon>TestItemView.paml</DependentUpon>
+    <Compile Include="TestItemView.xaml.cs">
+      <DependentUpon>TestItemView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
     <Compile Include="ViewModels\TestItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <EmbeddedResource Include="MainWindow.paml">
+    <EmbeddedResource Include="MainWindow.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <EmbeddedResource Include="TestItemView.paml" />
+    <EmbeddedResource Include="TestItemView.xaml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj">
diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 439c61688f..d01ab6f126 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/perspex">
   <Application.Styles>
-    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.paml?assembly=Perspex.Themes.Default"/>
-    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.xaml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"/>
 
     <Style Selector="TextBlock.h1">
       <Setter Property="Foreground" Value="#212121"/>
@@ -14,6 +14,6 @@
       <Setter Property="FontSize" Value="13"/>
     </Style>
 
-    <StyleInclude Source="resm:ControlCatalog.SideBar.paml"/>
+    <StyleInclude Source="resm:ControlCatalog.SideBar.xaml"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index dcadaaab40..be2b312204 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -54,64 +54,64 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App.paml.cs">
-      <DependentUpon>App.paml</DependentUpon>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainWindow.paml.cs">
-      <DependentUpon>MainWindow.paml</DependentUpon>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CheckBoxPage.paml.cs">
-      <DependentUpon>CheckBoxPage.paml</DependentUpon>
+    <Compile Include="Pages\CheckBoxPage.xaml.cs">
+      <DependentUpon>CheckBoxPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\BorderPage.paml.cs">
-      <DependentUpon>BorderPage.paml</DependentUpon>
+    <Compile Include="Pages\BorderPage.xaml.cs">
+      <DependentUpon>BorderPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CarouselPage.paml.cs">
-      <DependentUpon>CarouselPage.paml</DependentUpon>
+    <Compile Include="Pages\CarouselPage.xaml.cs">
+      <DependentUpon>CarouselPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CanvasPage.paml.cs">
-      <DependentUpon>CanvasPage.paml</DependentUpon>
+    <Compile Include="Pages\CanvasPage.xaml.cs">
+      <DependentUpon>CanvasPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\ButtonPage.paml.cs">
-      <DependentUpon>ButtonPage.paml</DependentUpon>
+    <Compile Include="Pages\ButtonPage.xaml.cs">
+      <DependentUpon>ButtonPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\DropDownPage.paml.cs">
-      <DependentUpon>DropDownPage.paml</DependentUpon>
+    <Compile Include="Pages\DropDownPage.xaml.cs">
+      <DependentUpon>DropDownPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\SliderPage.paml.cs">
-      <DependentUpon>SliderPage.paml</DependentUpon>
+    <Compile Include="Pages\SliderPage.xaml.cs">
+      <DependentUpon>SliderPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <EmbeddedResource Include="App.paml">
+    <EmbeddedResource Include="App.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\ButtonPage.paml">
+    <EmbeddedResource Include="Pages\ButtonPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="SideBar.paml">
+    <EmbeddedResource Include="SideBar.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainWindow.paml">
+    <EmbeddedResource Include="MainWindow.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\BorderPage.paml">
+    <EmbeddedResource Include="Pages\BorderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CanvasPage.paml">
+    <EmbeddedResource Include="Pages\CanvasPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\CarouselPage.paml">
+    <EmbeddedResource Include="Pages\CarouselPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\DropDownPage.paml" />
+    <EmbeddedResource Include="Pages\DropDownPage.xaml" />
     <None Include="packages.config" />
-    <EmbeddedResource Include="Pages\CheckBoxPage.paml">
+    <EmbeddedResource Include="Pages\CheckBoxPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\SliderPage.paml">
+    <EmbeddedResource Include="Pages\SliderPage.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/samples/TestApplicationShared/App.cs b/samples/TestApplicationShared/App.cs
index f8f8996dcb..e4211ffb82 100644
--- a/samples/TestApplicationShared/App.cs
+++ b/samples/TestApplicationShared/App.cs
@@ -21,7 +21,7 @@ namespace TestApplication
 
             var loader = new PerspexXamlLoader();
             var baseLight = (IStyle)loader.Load(
-                new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"));
+                new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"));
             Styles.Add(baseLight);
 
             Styles.Add(new SampleTabStyle());
diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.xaml b/samples/XamlTestApplicationPcl/XamlTestApp.xaml
index af67591349..c13fac8538 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApp.xaml
+++ b/samples/XamlTestApplicationPcl/XamlTestApp.xaml
@@ -2,7 +2,7 @@
         xmlns="https://github.com/perspex"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Application.Styles>
-    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.paml?assembly=Perspex.Themes.Default"/>
-    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.DefaultTheme.xaml?assembly=Perspex.Themes.Default"/>
+    <StyleInclude Source="resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"/>
   </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index c7fb0e8484..f027c763e8 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .NET Framework is automatically included -->
-    <EmbeddedResource Include="Views\MainWindow.paml">
+    <EmbeddedResource Include="Views\MainWindow.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
@@ -141,7 +141,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="XamlTestApp.paml">
+    <EmbeddedResource Include="XamlTestApp.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="packages.config" />
diff --git a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
index 51d9be0e24..a3221b3f74 100644
--- a/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
+++ b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
@@ -66,7 +66,7 @@ namespace Perspex.Markup.Xaml
             Contract.Requires<ArgumentNullException>(type != null);
 
             // HACK: Currently Visual Studio is forcing us to change the extension of xaml files
-            // in certain situations, so we try to load .xaml and if that's not found we try .paml.
+            // in certain situations, so we try to load .xaml and if that's not found we try .xaml.
             // Ideally we'd be able to use .xaml everywhere
             var assetLocator = PerspexLocator.Current.GetService<IAssetLoader>();
 
@@ -156,7 +156,7 @@ namespace Perspex.Markup.Xaml
             var asm = type.GetTypeInfo().Assembly.GetName().Name;
             var typeName = type.FullName;
             yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm);
-            yield return new Uri("resm:" + typeName + ".paml?assembly=" + asm);
+            yield return new Uri("resm:" + typeName + ".xaml?assembly=" + asm);
 
         }
 
diff --git a/src/Perspex.Application/Designer/DesignerAssist.cs b/src/Perspex.Application/Designer/DesignerAssist.cs
index 8ebd04e3f0..98a1bcbe8f 100644
--- a/src/Perspex.Application/Designer/DesignerAssist.cs
+++ b/src/Perspex.Application/Designer/DesignerAssist.cs
@@ -28,7 +28,7 @@ namespace Perspex.DesignerSupport
 
                 var loader = new PerspexXamlLoader();
                 var baseLight = (IStyle)loader.Load(
-                    new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"));
+                    new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"));
                 Styles.Add(baseLight);
             }
         }
diff --git a/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
index be4cdaccac..0eadadd30e 100644
--- a/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
+++ b/src/Perspex.Diagnostics/Perspex.Diagnostics.csproj
@@ -105,11 +105,11 @@
     <Compile Include="ViewModels\LogicalTreeNode.cs" />
     <Compile Include="ViewModels\TreeNode.cs" />
     <Compile Include="ViewModels\VisualTreeNode.cs" />
-    <Compile Include="Views\TreePage.paml.cs">
-      <DependentUpon>TreePageView.paml</DependentUpon>
+    <Compile Include="Views\TreePage.xaml.cs">
+      <DependentUpon>TreePageView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DevTools.paml.cs">
-      <DependentUpon>DevTools.paml</DependentUpon>
+    <Compile Include="DevTools.xaml.cs">
+      <DependentUpon>DevTools.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\ControlDetailsView.cs" />
     <Compile Include="Views\GridRepeater.cs" />
@@ -134,10 +134,10 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <EmbeddedResource Include="DevTools.paml">
+    <EmbeddedResource Include="DevTools.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Views\TreePageView.paml">
+    <EmbeddedResource Include="Views\TreePageView.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/src/Perspex.Themes.Default/DefaultTheme.xaml b/src/Perspex.Themes.Default/DefaultTheme.xaml
index 78f80308ea..b25c85bbd1 100644
--- a/src/Perspex.Themes.Default/DefaultTheme.xaml
+++ b/src/Perspex.Themes.Default/DefaultTheme.xaml
@@ -1,34 +1,34 @@
 <Styles xmlns="https://github.com/perspex">
-  <StyleInclude Source="resm:Perspex.Themes.Default.FocusAdorner.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Button.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Carousel.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.CheckBox.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ContentControl.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.DropDown.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.DropDownItem.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.GridSplitter.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ItemsControl.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ListBox.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ListBoxItem.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Menu.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ContextMenu.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.MenuItem.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.PopupRoot.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ProgressBar.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.RadioButton.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Separator.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Slider.paml?assembly=Perspex.Themes.Default"/>  
-  <StyleInclude Source="resm:Perspex.Themes.Default.ScrollBar.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ScrollViewer.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.TabStrip.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.TabStripItem.paml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.FocusAdorner.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Button.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Carousel.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.CheckBox.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ContentControl.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.DropDown.xaml?assembly=Perspex.Themes.Default"/>
+  <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.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"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ContextMenu.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.MenuItem.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.PopupRoot.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ProgressBar.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.RadioButton.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Separator.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Slider.xaml?assembly=Perspex.Themes.Default"/>  
+  <StyleInclude Source="resm:Perspex.Themes.Default.ScrollBar.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ScrollViewer.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TabStrip.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TabStripItem.xaml?assembly=Perspex.Themes.Default"/>
   <!-- TabControl needs to come after TabStrip as it redefines the inner TabStrip.ItemsPanel-->
-  <StyleInclude Source="resm:Perspex.Themes.Default.TabControl.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.TextBox.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ToggleButton.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Expander.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.ToolTip.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.TreeView.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.TreeViewItem.paml?assembly=Perspex.Themes.Default"/>
-  <StyleInclude Source="resm:Perspex.Themes.Default.Window.paml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TabControl.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TextBox.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ToggleButton.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Expander.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.ToolTip.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TreeView.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.TreeViewItem.xaml?assembly=Perspex.Themes.Default"/>
+  <StyleInclude Source="resm:Perspex.Themes.Default.Window.xaml?assembly=Perspex.Themes.Default"/>
 </Styles>
diff --git a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
index 171a3a17c1..e954fd0419 100644
--- a/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
+++ b/src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
@@ -80,8 +80,8 @@
     <Compile Include="..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="DefaultTheme.paml.cs">
-      <DependentUpon>DefaultTheme.paml</DependentUpon>
+    <Compile Include="DefaultTheme.xaml.cs">
+      <DependentUpon>DefaultTheme.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -100,103 +100,103 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Accents\BaseLight.paml">
+    <EmbeddedResource Include="Accents\BaseLight.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="app.config" />
-    <EmbeddedResource Include="Button.paml">
+    <EmbeddedResource Include="Button.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Carousel.paml">
+    <EmbeddedResource Include="Carousel.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="CheckBox.paml">
+    <EmbeddedResource Include="CheckBox.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ContentControl.paml">
+    <EmbeddedResource Include="ContentControl.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="DropDown.paml">
+    <EmbeddedResource Include="DropDown.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="FocusAdorner.paml">
+    <EmbeddedResource Include="FocusAdorner.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="GridSplitter.paml">
+    <EmbeddedResource Include="GridSplitter.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ItemsControl.paml">
+    <EmbeddedResource Include="ItemsControl.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ListBox.paml">
+    <EmbeddedResource Include="ListBox.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ListBoxItem.paml">
+    <EmbeddedResource Include="ListBoxItem.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Menu.paml">
+    <EmbeddedResource Include="Menu.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="MenuItem.paml">
+    <EmbeddedResource Include="MenuItem.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ProgressBar.paml">
+    <EmbeddedResource Include="ProgressBar.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ToolTip.paml">
+    <EmbeddedResource Include="ToolTip.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Expander.paml" />
-    <EmbeddedResource Include="DropDownItem.paml">
+    <EmbeddedResource Include="Expander.xaml" />
+    <EmbeddedResource Include="DropDownItem.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ContextMenu.paml">
+    <EmbeddedResource Include="ContextMenu.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <EmbeddedResource Include="PopupRoot.paml">
+    <EmbeddedResource Include="PopupRoot.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="RadioButton.paml">
+    <EmbeddedResource Include="RadioButton.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ScrollBar.paml">
+    <EmbeddedResource Include="ScrollBar.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ScrollViewer.paml">
+    <EmbeddedResource Include="ScrollViewer.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TabControl.paml">
+    <EmbeddedResource Include="TabControl.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TabStripItem.paml">
+    <EmbeddedResource Include="TabStripItem.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TabStrip.paml">
+    <EmbeddedResource Include="TabStrip.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TextBox.paml">
+    <EmbeddedResource Include="TextBox.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="ToggleButton.paml">
+    <EmbeddedResource Include="ToggleButton.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TreeView.paml">
+    <EmbeddedResource Include="TreeView.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="TreeViewItem.paml">
+    <EmbeddedResource Include="TreeViewItem.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Window.paml">
+    <EmbeddedResource Include="Window.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="DefaultTheme.paml">
+    <EmbeddedResource Include="DefaultTheme.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Separator.paml">
+    <EmbeddedResource Include="Separator.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Slider.paml">
+    <EmbeddedResource Include="Slider.xaml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/tests/Perspex.UnitTests/TestServices.cs b/tests/Perspex.UnitTests/TestServices.cs
index 81d76d0af3..7ad4b4b69d 100644
--- a/tests/Perspex.UnitTests/TestServices.cs
+++ b/tests/Perspex.UnitTests/TestServices.cs
@@ -117,7 +117,7 @@ namespace Perspex.UnitTests
 
             var loader = new PerspexXamlLoader();
             var baseLight = (IStyle)loader.Load(
-                new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.paml?assembly=Perspex.Themes.Default"));
+                new Uri("resm:Perspex.Themes.Default.Accents.BaseLight.xaml?assembly=Perspex.Themes.Default"));
             result.Add(baseLight);
 
             return result;