diff --git a/samples/BindingTest/App.paml b/samples/BindingTest/App.xaml similarity index 100% rename from samples/BindingTest/App.paml rename to samples/BindingTest/App.xaml diff --git a/samples/BindingTest/App.paml.cs b/samples/BindingTest/App.xaml.cs similarity index 100% rename from samples/BindingTest/App.paml.cs rename to samples/BindingTest/App.xaml.cs diff --git a/samples/BindingTest/MainWindow.paml b/samples/BindingTest/MainWindow.xaml similarity index 100% rename from samples/BindingTest/MainWindow.paml rename to samples/BindingTest/MainWindow.xaml diff --git a/samples/BindingTest/MainWindow.paml.cs b/samples/BindingTest/MainWindow.xaml.cs similarity index 100% rename from samples/BindingTest/MainWindow.paml.cs rename to samples/BindingTest/MainWindow.xaml.cs diff --git a/samples/BindingTest/TestItemView.paml b/samples/BindingTest/TestItemView.xaml similarity index 100% rename from samples/BindingTest/TestItemView.paml rename to samples/BindingTest/TestItemView.xaml diff --git a/samples/BindingTest/TestItemView.paml.cs b/samples/BindingTest/TestItemView.xaml.cs similarity index 100% rename from samples/BindingTest/TestItemView.paml.cs rename to samples/BindingTest/TestItemView.xaml.cs diff --git a/samples/ControlCatalog/App.paml b/samples/ControlCatalog/App.xaml similarity index 100% rename from samples/ControlCatalog/App.paml rename to samples/ControlCatalog/App.xaml diff --git a/samples/ControlCatalog/App.paml.cs b/samples/ControlCatalog/App.xaml.cs similarity index 100% rename from samples/ControlCatalog/App.paml.cs rename to samples/ControlCatalog/App.xaml.cs diff --git a/samples/ControlCatalog/MainWindow.paml b/samples/ControlCatalog/MainWindow.xaml similarity index 100% rename from samples/ControlCatalog/MainWindow.paml rename to samples/ControlCatalog/MainWindow.xaml diff --git a/samples/ControlCatalog/MainWindow.paml.cs b/samples/ControlCatalog/MainWindow.xaml.cs similarity index 100% rename from samples/ControlCatalog/MainWindow.paml.cs rename to samples/ControlCatalog/MainWindow.xaml.cs diff --git a/samples/ControlCatalog/Pages/BorderPage.paml b/samples/ControlCatalog/Pages/BorderPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/BorderPage.paml rename to samples/ControlCatalog/Pages/BorderPage.xaml diff --git a/samples/ControlCatalog/Pages/BorderPage.paml.cs b/samples/ControlCatalog/Pages/BorderPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/BorderPage.paml.cs rename to samples/ControlCatalog/Pages/BorderPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/ButtonPage.paml b/samples/ControlCatalog/Pages/ButtonPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/ButtonPage.paml rename to samples/ControlCatalog/Pages/ButtonPage.xaml diff --git a/samples/ControlCatalog/Pages/ButtonPage.paml.cs b/samples/ControlCatalog/Pages/ButtonPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/ButtonPage.paml.cs rename to samples/ControlCatalog/Pages/ButtonPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/CanvasPage.paml b/samples/ControlCatalog/Pages/CanvasPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/CanvasPage.paml rename to samples/ControlCatalog/Pages/CanvasPage.xaml diff --git a/samples/ControlCatalog/Pages/CanvasPage.paml.cs b/samples/ControlCatalog/Pages/CanvasPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/CanvasPage.paml.cs rename to samples/ControlCatalog/Pages/CanvasPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/CarouselPage.paml b/samples/ControlCatalog/Pages/CarouselPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/CarouselPage.paml rename to samples/ControlCatalog/Pages/CarouselPage.xaml diff --git a/samples/ControlCatalog/Pages/CarouselPage.paml.cs b/samples/ControlCatalog/Pages/CarouselPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/CarouselPage.paml.cs rename to samples/ControlCatalog/Pages/CarouselPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.paml b/samples/ControlCatalog/Pages/CheckBoxPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/CheckBoxPage.paml rename to samples/ControlCatalog/Pages/CheckBoxPage.xaml diff --git a/samples/ControlCatalog/Pages/CheckBoxPage.paml.cs b/samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/CheckBoxPage.paml.cs rename to samples/ControlCatalog/Pages/CheckBoxPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/DropDownPage.paml b/samples/ControlCatalog/Pages/DropDownPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/DropDownPage.paml rename to samples/ControlCatalog/Pages/DropDownPage.xaml diff --git a/samples/ControlCatalog/Pages/DropDownPage.paml.cs b/samples/ControlCatalog/Pages/DropDownPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/DropDownPage.paml.cs rename to samples/ControlCatalog/Pages/DropDownPage.xaml.cs diff --git a/samples/ControlCatalog/Pages/SliderPage.paml b/samples/ControlCatalog/Pages/SliderPage.xaml similarity index 100% rename from samples/ControlCatalog/Pages/SliderPage.paml rename to samples/ControlCatalog/Pages/SliderPage.xaml diff --git a/samples/ControlCatalog/Pages/SliderPage.paml.cs b/samples/ControlCatalog/Pages/SliderPage.xaml.cs similarity index 100% rename from samples/ControlCatalog/Pages/SliderPage.paml.cs rename to samples/ControlCatalog/Pages/SliderPage.xaml.cs diff --git a/samples/ControlCatalog/SideBar.paml b/samples/ControlCatalog/SideBar.xaml similarity index 100% rename from samples/ControlCatalog/SideBar.paml rename to samples/ControlCatalog/SideBar.xaml diff --git a/samples/XamlTestApplicationPcl/Views/MainWindow.paml b/samples/XamlTestApplicationPcl/Views/MainWindow.xaml similarity index 100% rename from samples/XamlTestApplicationPcl/Views/MainWindow.paml rename to samples/XamlTestApplicationPcl/Views/MainWindow.xaml diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.paml b/samples/XamlTestApplicationPcl/XamlTestApp.xaml similarity index 100% rename from samples/XamlTestApplicationPcl/XamlTestApp.paml rename to samples/XamlTestApplicationPcl/XamlTestApp.xaml diff --git a/src/Perspex.Diagnostics/DevTools.paml b/src/Perspex.Diagnostics/DevTools.xaml similarity index 100% rename from src/Perspex.Diagnostics/DevTools.paml rename to src/Perspex.Diagnostics/DevTools.xaml diff --git a/src/Perspex.Diagnostics/DevTools.paml.cs b/src/Perspex.Diagnostics/DevTools.xaml.cs similarity index 100% rename from src/Perspex.Diagnostics/DevTools.paml.cs rename to src/Perspex.Diagnostics/DevTools.xaml.cs diff --git a/src/Perspex.Diagnostics/Views/TreePage.paml.cs b/src/Perspex.Diagnostics/Views/TreePage.xaml.cs similarity index 100% rename from src/Perspex.Diagnostics/Views/TreePage.paml.cs rename to src/Perspex.Diagnostics/Views/TreePage.xaml.cs diff --git a/src/Perspex.Diagnostics/Views/TreePageView.paml b/src/Perspex.Diagnostics/Views/TreePageView.xaml similarity index 100% rename from src/Perspex.Diagnostics/Views/TreePageView.paml rename to src/Perspex.Diagnostics/Views/TreePageView.xaml diff --git a/src/Perspex.Themes.Default/Accents/BaseLight.paml b/src/Perspex.Themes.Default/Accents/BaseLight.xaml similarity index 100% rename from src/Perspex.Themes.Default/Accents/BaseLight.paml rename to src/Perspex.Themes.Default/Accents/BaseLight.xaml diff --git a/src/Perspex.Themes.Default/Button.paml b/src/Perspex.Themes.Default/Button.xaml similarity index 100% rename from src/Perspex.Themes.Default/Button.paml rename to src/Perspex.Themes.Default/Button.xaml diff --git a/src/Perspex.Themes.Default/Carousel.paml b/src/Perspex.Themes.Default/Carousel.xaml similarity index 100% rename from src/Perspex.Themes.Default/Carousel.paml rename to src/Perspex.Themes.Default/Carousel.xaml diff --git a/src/Perspex.Themes.Default/CheckBox.paml b/src/Perspex.Themes.Default/CheckBox.xaml similarity index 100% rename from src/Perspex.Themes.Default/CheckBox.paml rename to src/Perspex.Themes.Default/CheckBox.xaml diff --git a/src/Perspex.Themes.Default/ContentControl.paml b/src/Perspex.Themes.Default/ContentControl.xaml similarity index 100% rename from src/Perspex.Themes.Default/ContentControl.paml rename to src/Perspex.Themes.Default/ContentControl.xaml diff --git a/src/Perspex.Themes.Default/ContextMenu.paml b/src/Perspex.Themes.Default/ContextMenu.xaml similarity index 100% rename from src/Perspex.Themes.Default/ContextMenu.paml rename to src/Perspex.Themes.Default/ContextMenu.xaml diff --git a/src/Perspex.Themes.Default/DefaultTheme.paml b/src/Perspex.Themes.Default/DefaultTheme.xaml similarity index 100% rename from src/Perspex.Themes.Default/DefaultTheme.paml rename to src/Perspex.Themes.Default/DefaultTheme.xaml diff --git a/src/Perspex.Themes.Default/DefaultTheme.paml.cs b/src/Perspex.Themes.Default/DefaultTheme.xaml.cs similarity index 100% rename from src/Perspex.Themes.Default/DefaultTheme.paml.cs rename to src/Perspex.Themes.Default/DefaultTheme.xaml.cs diff --git a/src/Perspex.Themes.Default/DropDown.paml b/src/Perspex.Themes.Default/DropDown.xaml similarity index 100% rename from src/Perspex.Themes.Default/DropDown.paml rename to src/Perspex.Themes.Default/DropDown.xaml diff --git a/src/Perspex.Themes.Default/DropDownItem.paml b/src/Perspex.Themes.Default/DropDownItem.xaml similarity index 100% rename from src/Perspex.Themes.Default/DropDownItem.paml rename to src/Perspex.Themes.Default/DropDownItem.xaml diff --git a/src/Perspex.Themes.Default/Expander.paml b/src/Perspex.Themes.Default/Expander.xaml similarity index 100% rename from src/Perspex.Themes.Default/Expander.paml rename to src/Perspex.Themes.Default/Expander.xaml diff --git a/src/Perspex.Themes.Default/FocusAdorner.paml b/src/Perspex.Themes.Default/FocusAdorner.xaml similarity index 100% rename from src/Perspex.Themes.Default/FocusAdorner.paml rename to src/Perspex.Themes.Default/FocusAdorner.xaml diff --git a/src/Perspex.Themes.Default/GridSplitter.paml b/src/Perspex.Themes.Default/GridSplitter.xaml similarity index 100% rename from src/Perspex.Themes.Default/GridSplitter.paml rename to src/Perspex.Themes.Default/GridSplitter.xaml diff --git a/src/Perspex.Themes.Default/ItemsControl.paml b/src/Perspex.Themes.Default/ItemsControl.xaml similarity index 100% rename from src/Perspex.Themes.Default/ItemsControl.paml rename to src/Perspex.Themes.Default/ItemsControl.xaml diff --git a/src/Perspex.Themes.Default/ListBox.paml b/src/Perspex.Themes.Default/ListBox.xaml similarity index 100% rename from src/Perspex.Themes.Default/ListBox.paml rename to src/Perspex.Themes.Default/ListBox.xaml diff --git a/src/Perspex.Themes.Default/ListBoxItem.paml b/src/Perspex.Themes.Default/ListBoxItem.xaml similarity index 100% rename from src/Perspex.Themes.Default/ListBoxItem.paml rename to src/Perspex.Themes.Default/ListBoxItem.xaml diff --git a/src/Perspex.Themes.Default/Menu.paml b/src/Perspex.Themes.Default/Menu.xaml similarity index 100% rename from src/Perspex.Themes.Default/Menu.paml rename to src/Perspex.Themes.Default/Menu.xaml diff --git a/src/Perspex.Themes.Default/MenuItem.paml b/src/Perspex.Themes.Default/MenuItem.xaml similarity index 100% rename from src/Perspex.Themes.Default/MenuItem.paml rename to src/Perspex.Themes.Default/MenuItem.xaml diff --git a/src/Perspex.Themes.Default/PopupRoot.paml b/src/Perspex.Themes.Default/PopupRoot.xaml similarity index 100% rename from src/Perspex.Themes.Default/PopupRoot.paml rename to src/Perspex.Themes.Default/PopupRoot.xaml diff --git a/src/Perspex.Themes.Default/ProgressBar.paml b/src/Perspex.Themes.Default/ProgressBar.xaml similarity index 100% rename from src/Perspex.Themes.Default/ProgressBar.paml rename to src/Perspex.Themes.Default/ProgressBar.xaml diff --git a/src/Perspex.Themes.Default/RadioButton.paml b/src/Perspex.Themes.Default/RadioButton.xaml similarity index 100% rename from src/Perspex.Themes.Default/RadioButton.paml rename to src/Perspex.Themes.Default/RadioButton.xaml diff --git a/src/Perspex.Themes.Default/ScrollBar.paml b/src/Perspex.Themes.Default/ScrollBar.xaml similarity index 100% rename from src/Perspex.Themes.Default/ScrollBar.paml rename to src/Perspex.Themes.Default/ScrollBar.xaml diff --git a/src/Perspex.Themes.Default/ScrollViewer.paml b/src/Perspex.Themes.Default/ScrollViewer.xaml similarity index 100% rename from src/Perspex.Themes.Default/ScrollViewer.paml rename to src/Perspex.Themes.Default/ScrollViewer.xaml diff --git a/src/Perspex.Themes.Default/Separator.paml b/src/Perspex.Themes.Default/Separator.xaml similarity index 100% rename from src/Perspex.Themes.Default/Separator.paml rename to src/Perspex.Themes.Default/Separator.xaml diff --git a/src/Perspex.Themes.Default/Slider.paml b/src/Perspex.Themes.Default/Slider.xaml similarity index 100% rename from src/Perspex.Themes.Default/Slider.paml rename to src/Perspex.Themes.Default/Slider.xaml diff --git a/src/Perspex.Themes.Default/TabControl.paml b/src/Perspex.Themes.Default/TabControl.xaml similarity index 100% rename from src/Perspex.Themes.Default/TabControl.paml rename to src/Perspex.Themes.Default/TabControl.xaml diff --git a/src/Perspex.Themes.Default/TabStrip.paml b/src/Perspex.Themes.Default/TabStrip.xaml similarity index 100% rename from src/Perspex.Themes.Default/TabStrip.paml rename to src/Perspex.Themes.Default/TabStrip.xaml diff --git a/src/Perspex.Themes.Default/TabStripItem.paml b/src/Perspex.Themes.Default/TabStripItem.xaml similarity index 100% rename from src/Perspex.Themes.Default/TabStripItem.paml rename to src/Perspex.Themes.Default/TabStripItem.xaml diff --git a/src/Perspex.Themes.Default/TextBox.paml b/src/Perspex.Themes.Default/TextBox.xaml similarity index 100% rename from src/Perspex.Themes.Default/TextBox.paml rename to src/Perspex.Themes.Default/TextBox.xaml diff --git a/src/Perspex.Themes.Default/ToggleButton.paml b/src/Perspex.Themes.Default/ToggleButton.xaml similarity index 100% rename from src/Perspex.Themes.Default/ToggleButton.paml rename to src/Perspex.Themes.Default/ToggleButton.xaml diff --git a/src/Perspex.Themes.Default/ToolTip.paml b/src/Perspex.Themes.Default/ToolTip.xaml similarity index 100% rename from src/Perspex.Themes.Default/ToolTip.paml rename to src/Perspex.Themes.Default/ToolTip.xaml diff --git a/src/Perspex.Themes.Default/TreeView.paml b/src/Perspex.Themes.Default/TreeView.xaml similarity index 100% rename from src/Perspex.Themes.Default/TreeView.paml rename to src/Perspex.Themes.Default/TreeView.xaml diff --git a/src/Perspex.Themes.Default/TreeViewItem.paml b/src/Perspex.Themes.Default/TreeViewItem.xaml similarity index 100% rename from src/Perspex.Themes.Default/TreeViewItem.paml rename to src/Perspex.Themes.Default/TreeViewItem.xaml diff --git a/src/Perspex.Themes.Default/Window.paml b/src/Perspex.Themes.Default/Window.xaml similarity index 100% rename from src/Perspex.Themes.Default/Window.paml rename to src/Perspex.Themes.Default/Window.xaml