diff --git a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
index 44b7f8c..c27c03c 100644
--- a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
+++ b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
@@ -13,6 +13,16 @@
     <RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
     <VersionPrefix>2.1.0</VersionPrefix>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Update="**\*.xaml.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
+    </Compile>
+    <AvaloniaResource Include="**\*.xaml">
+      <SubType>Designer</SubType>
+    </AvaloniaResource>
+  </ItemGroup>
+  
   <ItemGroup>
     <EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
     <PackageReference Include="Avalonia" Version="0.10.11" />
diff --git a/Source/OxyPlot.Avalonia/Themes/Default.xaml b/Source/OxyPlot.Avalonia/Themes/Default.xaml
index 588dd47..f6bb833 100644
--- a/Source/OxyPlot.Avalonia/Themes/Default.xaml
+++ b/Source/OxyPlot.Avalonia/Themes/Default.xaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:local="http://oxyplot.org/avalonia"
-        xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters;assembly=OxyPlot.Avalonia">
+        xmlns:local="clr-namespace:OxyPlot.Avalonia"
+        xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters">
 
     <Style Selector="local|TrackerControl">
         <Setter Property="Background" Value="#E0FFFFA0" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fc6b4da..2422440 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -36,7 +36,7 @@ jobs:
       versioningScheme: 'byPrereleaseNumber'
 - job: Linux
   pool:
-    vmImage: 'ubuntu 16.04'
+    vmImage: 'ubuntu-latest'
   variables:
     solution: '**/*.sln'
     buildPlatform: 'Any CPU'