diff --git a/src/SpiroNet.Avalonia/App.xaml.cs b/src/SpiroNet.Avalonia/App.xaml.cs
index b351250..2cb36e0 100644
--- a/src/SpiroNet.Avalonia/App.xaml.cs
+++ b/src/SpiroNet.Avalonia/App.xaml.cs
@@ -19,21 +19,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 */
 using Avalonia;
+using Avalonia.Markup.Xaml;
 
 namespace SpiroNet.Avalonia
 {
     public class App : Application
     {
-        public App()
+        public override void Initialize()
         {
-            RegisterServices();
-        }
-
-        public void Start()
-        {
-            var mainWindow = new MainWindow();
-            mainWindow.Show();
-            Run(mainWindow);
+            AvaloniaXamlLoader.Load(this);
         }
     }
 }
diff --git a/src/SpiroNet.Avalonia/MainWindow.xaml.cs b/src/SpiroNet.Avalonia/MainWindow.xaml.cs
index fa42ee4..9ba8ca5 100644
--- a/src/SpiroNet.Avalonia/MainWindow.xaml.cs
+++ b/src/SpiroNet.Avalonia/MainWindow.xaml.cs
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 */
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 
 namespace SpiroNet.Avalonia
 {
@@ -33,7 +34,7 @@ namespace SpiroNet.Avalonia
 
         private void InitializeComponent()
         {
-            this.LoadFromXaml();
+            AvaloniaXamlLoader.Load(this);
         }
     }
 }
diff --git a/src/SpiroNet.Avalonia/Program.cs b/src/SpiroNet.Avalonia/Program.cs
index 79d06b4..32e0064 100644
--- a/src/SpiroNet.Avalonia/Program.cs
+++ b/src/SpiroNet.Avalonia/Program.cs
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 */
 using Avalonia;
+using Avalonia.Controls;
 using Avalonia.Logging.Serilog;
 using Serilog;
 using System;
@@ -33,7 +34,10 @@ namespace SpiroNet.Avalonia
             try
             {
                 InitializeLogging();
-                new App().UseWin32().UseDirect2D().LoadFromXaml().Start();
+                AppBuilder.Configure<App>()
+                    .UseWin32()
+                    .UseDirect2D1()
+                    .Start<MainWindow>();
             }
             catch (Exception ex)
             {
diff --git a/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj b/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
index 237114e..26ee0a3 100644
--- a/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
+++ b/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
@@ -38,83 +38,83 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Cairo, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1518-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1523-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1518-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1523-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.5977.33679, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1518-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.5978.18564, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1523-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.HtmlRenderer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Logging.Serilog, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.ReactiveUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.SceneGraph, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1518-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1523-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1518-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1523-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
diff --git a/src/SpiroNet.Avalonia/packages.config b/src/SpiroNet.Avalonia/packages.config
index 65b6c94..ec45687 100644
--- a/src/SpiroNet.Avalonia/packages.config
+++ b/src/SpiroNet.Avalonia/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.2.0.1518-alpha" targetFramework="net45" />
-  <package id="Avalonia.Desktop" version="0.2.0.1518-alpha" targetFramework="net45" />
+  <package id="Avalonia" version="0.2.0.1523-alpha" targetFramework="net45" />
+  <package id="Avalonia.Desktop" version="0.2.0.1523-alpha" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />